Skip to content

Commit

Permalink
Tweak columns, spacings and sizes on article page
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminvo committed Feb 4, 2017
1 parent d1b49b4 commit 520da60
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
23 changes: 11 additions & 12 deletions src/routes/article.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,34 +32,33 @@
<!-- Left column -->
<div class="article_details span-3">

<div class="display-flex alignItems-center margin-top margin-bottom-6-1 margin-none-tablet">
<div class="display-flex alignItems-center margin-bottom-7-1 margin-none-tablet">
<toggle-checkmark
small
class="margin-right"
class="margin-right-2-1"
:click="toggleArticleFinished.bind(this, this.$route.params.articleId, article.title, currentUser.uid, currentUser.displayName, 'articleFinished', this.userAnonymous)"
:checked="article.finishedBy ? article.finishedBy[currentUser.uid] : null" />
<p class="display-inlineBlock fontSize-small color-dark" v-for="(course, index) in this.articleCourses">Due {{ course.weekday }}</p>
<p class="display-inlineBlock color-dark" v-for="(course, index) in this.articleCourses">Due {{ course.weekday }}</p>
</div>

<h6 class="margin-top-4-1 margin-bottom-2-1 color-base-lighter-2 fontWeight-bold">Details</h6>
<ul class="list-unstyled color-base-lighter-2">
<li class="margin-bottom fontSize-small">{{ article.author }} ({{ article.year }})</li>
<li class="margin-bottom fontSize-small">{{ pagesTotal }} pages ({{ article.pageFrom }}-{{ article.pageTo }})</li>
<li v-if="article.chapter" class="margin-bottom fontSize-small">Chapter {{ article.chapter }}</li>
<li v-if="article.citedBy" class="margin-bottom fontSize-small">Cited by {{ article.citedBy }}</li>
<li class="margin-bottom">{{ article.author }} ({{ article.year }})</li>
<li class="margin-bottom">{{ pagesTotal }} pages ({{ article.pageFrom }}-{{ article.pageTo }})</li>
<li v-if="article.chapter" class="margin-bottom">Chapter {{ article.chapter }}</li>
<li v-if="article.citedBy" class="margin-bottom">Cited by {{ article.citedBy }}</li>
</ul>

<div v-if="article.tableOfContents">
<h6 class="margin-top-4-1 margin-bottom-2-1 color-base-lighter-2 fontWeight-bold">Table of Contents</h6>
<ul class="list-unstyled color-base-lighter-2">
<li v-for="(item, key, index) in article.tableOfContents" class="margin-bottom fontSize-small">{{ item }}</li>
<li v-for="(item, key, index) in article.tableOfContents" class="margin-bottom">{{ item }}</li>
</ul>
</div>

</div>

<!-- Right column -->
<div class="article_introduction span-9 card card-2">
<div class="article_introduction offset-1 span-8 card card-2">

<div class="article_introduction_upper">

Expand Down Expand Up @@ -224,7 +223,7 @@
.article {
&_details,
&_introduction { margin-top: -$scale-12-1; }
&_introduction { margin-top: -$scale-13-1; }
&_details {
@include breakpoint('tablet') { margin-top: 0; }}
Expand Down Expand Up @@ -252,7 +251,7 @@
.guide p {
font-size: 16px !important;
line-height: 1.6;
max-width: 60ch; // 1ch = width of glyph '0', so this is approx. the wished for 65 chars per line
//max-width: 60ch; // 1ch = width of glyph '0', so this is approx. the wished for 65 chars per line
margin-bottom: $scale-2-1;
&:last-child { margin-bottom: 0; }
Expand Down
1 change: 1 addition & 0 deletions src/styles/_vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

$scale: 8px;

$scale-13-1: $scale * 13;
$scale-12-1: $scale * 12;
$scale-11-1: $scale * 11;
$scale-10-1: $scale * 10;
Expand Down

0 comments on commit 520da60

Please sign in to comment.