Code
/
lmmi_journal_theme
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge branch 'master' of https://github.com/rdrew/lmmi_journal_theme

dependabot/npm_and_yarn/acorn-5.7.4
Rob Drew 6 years ago
parent
c665094c09 5dcdd69dbb
commit
fde176b479
6 changed files with 58 additions and 95 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 29
      css/style.css
  2. 2
      css/style.css.map
  3. 2
      src/scss/_article-pages.scss
  4. 2
      src/scss/_cite-this.scss
  5. 52
      src/scss/_typography.scss
  6. 66
      templates/article_pages/;q

29
css/style.css
Unescape View File

@ -291,23 +291,24 @@ h6 {
letter-spacing: 0.2em; letter-spacing: 0.2em;
text-transform: uppercase; } text-transform: uppercase; }
h1, h2, h3, h4, h5 {
margin: 2.75rem 0 1rem;
font-family: 'Libre Baskerville', serif;
font-weight: 400;
line-height: 1.15; }
h1 { h1 {
font-size: 40px; } margin-top: 0;
font-size: 2.441em; }
h2 { h2 {
font-size: 35px; } font-size: 1.953em; }
h3 { h3 {
font-size: 30px; } font-size: 1.563em; }
h4 { h4 {
font-size: 26px; } font-size: 1.25em; }
h5 {
font-size: 24px; }
h6 {
font-size: 18px; }
h1.title { h1.title {
margin-top: 0; } margin-top: 0; }
@ -782,7 +783,9 @@ figure.align-left {
h3.field-group-format-toggler.accordion-item a { h3.field-group-format-toggler.accordion-item a {
color: #2e2e2e; color: #2e2e2e;
border-bottom: 1px solid #2e2e2e; border-bottom: 1px solid #2e2e2e;
display: block; } display: block;
/*@extend h2;*/
font-size: 30px; }
.back-to-top { .back-to-top {
display: none; } display: none; }
@ -941,7 +944,9 @@ h3.field-group-format-toggler.accordion-item a {
width: 1170px; } width: 1170px; }
.block-cite-this-block .title { .block-cite-this-block .title {
text-align: left; } text-align: left;
border-bottom: 1px solid #333;
border-top: none !important; }
.article_attachment a { .article_attachment a {
line-height: calc(155% + 0.2vw); line-height: calc(155% + 0.2vw);

2
css/style.css.map
View File

File diff suppressed because one or more lines are too long

2
src/scss/_article-pages.scss
Unescape View File

@ -266,6 +266,8 @@ h3.field-group-format-toggler.accordion-item {
color: #2e2e2e; color: #2e2e2e;
border-bottom: 1px solid #2e2e2e; border-bottom: 1px solid #2e2e2e;
display: block; display: block;
/*@extend h2;*/
font-size: 30px;
} }
} }
.back-to-top { .back-to-top {

2
src/scss/_cite-this.scss
Unescape View File

@ -9,6 +9,8 @@
//===================== //=====================
.title { .title {
text-align: left; text-align: left;
border-bottom: 1px solid #333;
border-top: none !important;
} }
} }

52
src/scss/_typography.scss
Unescape View File

@ -293,24 +293,44 @@ h6 {
letter-spacing: 0.2em; letter-spacing: 0.2em;
text-transform: uppercase; text-transform: uppercase;
} }
h1 { h1, h2, h3, h4, h5 {
font-size: 40px; margin: 2.75rem 0 1rem;
} font-family: 'Libre Baskerville', serif;
h2 { font-weight: 400;
font-size: 35px; line-height: 1.15;
}
h3 {
font-size: 30px;
}
h4 {
font-size: 26px;
}
h5 {
font-size: 24px;
} }
h6 {
font-size: 18px; h1 {
margin-top: 0;
font-size: 2.441em;
} }
//h2 {font-size: 2.441em;}
h2 {font-size: 1.953em;}
h3 {font-size: 1.563em;}
h4 {font-size: 1.25em;}
//h1 {
//font-size: 40px;
//font-size: 40px;
//}
//h2 {
//font-size: 35px;
//}
//h3 {
//font-size: 30px;
//}
//h4 {
//font-size: 26px;
//}
//h5 {
//font-size: 24px;
//}
//h6 {
//font-size: 18px;
//}
h1.title { h1.title {
margin-top: 0; margin-top: 0;
} }

66
templates/article_pages/;q
Unescape View File

@ -1,66 +0,0 @@
{% set imagePath = file_url(content.field_article_highlight_image|field_target_entity.image.entity.uri.value) %}
{% set articleType = content.field_article_type|field_value %}
{% set pubDate = content.field_publication_date_electroni|field_value %}
{% if articleType == "Article" %}
{% set _icon_ = 'fa-file-text-o' %}
{% set _color_ = 'blue' %}
{% elseif articleType == "Audio/visual art" %}
{% set _icon_ = 'fa-volume-up' %}
{% set _color_ = 'red' %}
{% elseif articleType == "Blog post" %}
{% set _icon_ = 'fa-rss' %}
{% set _color_ = 'green' %}
{% elseif articleType == "Creative writing" %}
{% set _icon_ = 'fa-pencil-square-o' %}
{% set _color_ = 'teal' %}
{% elseif articleType == "News" %}
{% set _icon_ = 'fa-newspaper-o' %}
{% set _color_ = 'purple' %}
{% elseif articleType == "Note" %}
{% set _icon_ = 'fa-envelope-open-o' %}
{% set _color_ = 'aqua' %}
{% elseif articleType == "Notice" %}
{% set _icon_ = 'fa-exclamation-circle' %}
{% set _color_ = 'teal' %}
{% else %}
{% set _icon_ = '' %}
{% set _color_ = '' %}
{% endif %}
<header style="background-image: linear-gradient(rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0.5)), url('{{ imagePath }}')" class="article-title-banner node__header paragraph-responsive-typography-enabled article-header">
<div class="container article-info--wrapper">
{% block title_area %}
{{ title_prefix }}
<a class="slide_link" href="{{url}}">
<h1{{ title_attributes.addClass('article--title title') }}>
{{ label }}
</h1>
</a>
<h1{{ title_attributes.addClass('article--title title sr-only') }}>
{{ label }}
</h1>
{{ title_suffix }}
{% endblock %}
<section class="article-header--metadata">
<div class="left">
<div class="article--contributor">
<!--Robert N. Drew-->
{{ content.field_authors_and_affiliations|without('label') }}
</div>
</div>
<div class="right">
<!-- <div class="article--type">{{ articleType}} </div> -->
<div class="article--type {{_icon_}}">{{ content.field_article_type|field_value }} </div>
<div class="article--date-published">
{{pubDate}} </div>
</div>
</section>
</div>
</header>
Write Preview
Loading…
Cancel
Save