Skip to content

Commit

Permalink
Merge pull request #345 from erudit/1682-theses-home
Browse files Browse the repository at this point in the history
#1682 - Theses
  • Loading branch information
cormier authored Aug 4, 2016
2 parents d10c6f1 + e63dc46 commit aac59d7
Show file tree
Hide file tree
Showing 30 changed files with 283 additions and 253 deletions.
2 changes: 1 addition & 1 deletion eruditorg/static/build/css/PublicApp.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eruditorg/static/build/css/UserspaceApp.css

Large diffs are not rendered by default.

Binary file modified eruditorg/static/build/css/font/VideoJS.eot
Binary file not shown.
2 changes: 1 addition & 1 deletion eruditorg/static/build/css/videojs.css

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions eruditorg/static/build/js/PublicApp.js

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions eruditorg/static/build/js/UserspaceApp.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eruditorg/static/build/js/modernizr.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions eruditorg/static/build/js/pdf-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion eruditorg/static/build/js/video.min.js.map

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions eruditorg/static/build/js/videojs.js

Large diffs are not rendered by default.

Binary file modified eruditorg/static/fonts/erudicon/erudicon.eot
Binary file not shown.
Binary file modified eruditorg/static/fonts/erudicon/erudicon.ttf
Binary file not shown.
Binary file modified eruditorg/static/fonts/erudicon/erudicon.woff
Binary file not shown.
7 changes: 3 additions & 4 deletions eruditorg/static/sass/PublicApp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,17 @@ $ionicons-font-path: "~ionicons/fonts";
'layout/header',
'layout/header-public',
'layout/nav-public',
'layout/main-public',
'layout/sidenav',
'layout/content',
'layout/footer';
'layout/footer',
'layout/aside';

// 5. Components
@import
'components/tables',
'components/tooltips',
'components/modals',
'components/cards',
'components/navtabs',
'components/search',
'components/forms',
'components/forms-checkbox',
'components/input-groups',
Expand Down
3 changes: 0 additions & 3 deletions eruditorg/static/sass/UserspaceApp.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,8 @@ $ionicons-font-path: "~ionicons/fonts";
// 5. Components
@import
'components/tables',
'components/tooltips',
'components/modals',
'components/cards',
'components/navtabs',
'components/search',
'components/forms',
'components/input-groups',
'components/dropdowns',
Expand Down
14 changes: 1 addition & 13 deletions eruditorg/static/sass/base/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Basic typography (copy of Bootstrap's type.scss)
* Basic typography
*/


Expand Down Expand Up @@ -181,18 +181,6 @@ mark,
}



// Page header
// -------------------------

.page-header {
padding-bottom: (($line-height-computed / 2) - 1);
margin: ($line-height-computed * 2) 0 $line-height-computed;
border-bottom: 1px solid $page-header-border-color;
}



// Misc
// -------------------------

Expand Down
Empty file.
Empty file.
Empty file.
15 changes: 15 additions & 0 deletions eruditorg/static/sass/layout/_aside.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// ------------------------------------------------------------------------
// This file contains styles for <aside>s / lateral bars in the public site
// ------------------------------------------------------------------------

aside {

h2 {
font-size: 20px;
}

p, li, dd {
font-size: 14px;
}

}
8 changes: 0 additions & 8 deletions eruditorg/static/sass/layout/_footer.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
/**
* erudit subscription badge
*/

footer#erudit-subscription-type {
margin-top: $margin-vertical-default;
}

/**
* Main site footer
*/
Expand Down
13 changes: 13 additions & 0 deletions eruditorg/static/sass/layout/_main-public.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// --------------------------------------------------------------------------------
// This file contains styles for main content in the public site (i.e. not <aside>)
// --------------------------------------------------------------------------------

.main-content {

h2 {
border-top: 1px solid #000;
padding-top: 0.75em;
margin: 1em 0 0.75em 0;
}

}
1 change: 0 additions & 1 deletion eruditorg/static/sass/pages/_homepage.scss
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ body.home {
.news {
.news--article {
margin-top: 20px;
margin-bottom: x60px;
padding-top: 18px;
@include grid-cell-border('top', 1px, #cccccc);

Expand Down
72 changes: 72 additions & 0 deletions eruditorg/static/sass/pages/_thesis-collection-home.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
.thesis_collection_home #breadcrumb {
background: $light-grey;
}

#thesis_collection_home {

.glory {
padding-top: 50px;
padding-bottom: 60px;
background-color: $light-grey;

h2 {
margin: 0 0 1em 0;
color: #000;
font-size: 0.85em;
@include fw-sans-medium();
}

.thesis-count {
display: block;
font-size: 0.85em;
@include fw-sans-normal();
}

.recent-theses {
margin-top: 1.5em;

> .thesis {
margin-bottom: 2em;
}


}

.thesis-title,
.thesis-author {
font-size: 0.85em;
margin: 0 0 0.5em 0;
}

.thesis-author {
@include fw-sans-medium();
}

}

.thesis-aggregation-links-wrapper{
margin: 2em 0;

.theses-list {
list-style: none;
margin: 0;
@include content-columns(4, $grid-gutter-width/2);

li {
margin-bottom: 0;
}

}

.aggregation-link{
margin-bottom: 4px;
display: inline-block;
font-size: 14px;
@include fw-mono();

&:hover, &:focus{
text-decoration: none;
}
}
}
}
60 changes: 60 additions & 0 deletions eruditorg/static/sass/pages/_thesis-home.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#thesis_home {

.repositories {
list-style: none;

.repository {
margin-bottom: 2em;

.collection-logo {
padding: 1em 0;
display: block;
border-bottom: 1px solid $dark-grey;

> img {
height: 40px;
width: auto;
}

}

.collection-title {
margin-top: 0.5em;
font-size: 1.15em;
@include fw-sans-medium();
}

&:nth-child(4n+1) {
clear: both;
}

}

.recent-theses {
margin-top: 0.5em;

h4 {
font-size: 1em;
border-bottom: 1px solid $mid-grey;
padding: 0.5em 0;
margin: 0;
@include fw-sans-normal-italic();
}

.thesis {
padding: 0.75em 0;
display: block;
font-size: 0.85em;
border-bottom: 1px solid $mid-grey;

&:last-child{
border: none;
}

}

}

}

}
63 changes: 0 additions & 63 deletions eruditorg/static/sass/pages/thesis-collection-home.scss

This file was deleted.

Loading

0 comments on commit aac59d7

Please sign in to comment.