diff --git a/web/themes/asc_bootstrap/assets/sass/components/_news.scss b/web/themes/asc_bootstrap/assets/sass/components/_news.scss index 3b98378f5740981294e66b46681d08234212f598..f4a4423d3f4630514e6e44dae38aa382412e9b95 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_news.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_news.scss @@ -89,6 +89,10 @@ article.news-story { -moz-osx-font-smoothing: grayscale; } +.news-title-wrapper { + padding: 0; +} + .news-title { text-transform: capitalize; } diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index 058f176af60165988e0442f7d0c8a0f211a02118..be961c3ea78d8e4697b3d2c10dd3184200a1668f 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -10826,39 +10826,44 @@ article.news-story { } /* line 92, ../assets/sass/components/_news.scss */ +.news-title-wrapper { + padding: 0; +} + +/* line 96, ../assets/sass/components/_news.scss */ .news-title { text-transform: capitalize; } -/* line 96, ../assets/sass/components/_news.scss */ +/* line 100, ../assets/sass/components/_news.scss */ .news-img { margin-bottom: 40px; } @media (max-width: 768px) { - /* line 96, ../assets/sass/components/_news.scss */ + /* line 100, ../assets/sass/components/_news.scss */ .news-img { margin: 0; padding: 0; } } -/* line 110, ../assets/sass/components/_news.scss */ +/* line 114, ../assets/sass/components/_news.scss */ .page-node-type-news-story .page-header { display: none; } -/* line 121, ../assets/sass/components/_news.scss */ +/* line 125, ../assets/sass/components/_news.scss */ .view-taxonomy-term .news-title { display: none; } -/* line 126, ../assets/sass/components/_news.scss */ +/* line 130, ../assets/sass/components/_news.scss */ .taxonomy-news-heading { float: left; width: 100%; padding-top: 15px; } -/* line 131, ../assets/sass/components/_news.scss */ +/* line 135, ../assets/sass/components/_news.scss */ .taxonomy-news-heading h2 { line-height: 0; font-size: 18px; diff --git a/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig b/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig index a6f35505077255c8c8728661e2798696f90551bf..3460767dd02a7f0c24d05d24a259033f1f74590b 100644 --- a/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig +++ b/web/themes/asc_bootstrap/templates/node/node--news-story.html.twig @@ -76,33 +76,37 @@ ] %} <article{{ attributes.addClass(classes) }}> -<span class="news-date"> - {% set createdDate = node.getCreatedTime|date('F j, Y') %} - {{ createdDate }} -</span> +<div class="col-sm-12 news-title-wrapper"> + <div class="col-xs-12 col-sm-8 news-title-wrapper"> + <span class="news-date"> + {% set createdDate = node.getCreatedTime|date('F j, Y') %} + {{ createdDate }} + </span> -<h1 class="news-title"> - {{ label }} -</h1> + <h1 class="news-title"> + {{ label }} + </h1> - {{ title_prefix }} - {% if not page %} - <h2{{ title_attributes }}> - <a href="{{ url }}" rel="bookmark">{{ label }}</a> - </h2> - {% endif %} - {{ title_suffix }} -{# - {% if display_submitted %} - <footer> - {{ author_picture }} - <div{{ author_attributes.addClass('author') }}> - {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %} - {{ metadata }} - </div> - </footer> - {% endif %} -#} + {{ title_prefix }} + {% if not page %} + <h2{{ title_attributes }}> + <a href="{{ url }}" rel="bookmark">{{ label }}</a> + </h2> + {% endif %} + {{ title_suffix }} + {# + {% if display_submitted %} + <footer> + {{ author_picture }} + <div{{ author_attributes.addClass('author') }}> + {% trans %}Submitted by {{ author_name }} on {{ date }}{% endtrans %} + {{ metadata }} + </div> + </footer> + {% endif %} + #} + </div> +</div> <div class="col-sm-4 col-sm-push-8 news-img"> {{ content.field_news_image2 }} diff --git a/web/themes/asc_bootstrap/templates/system/user.html.twig b/web/themes/asc_bootstrap/templates/system/user.html.twig index 19dc4eb00fea18e3de293da4be50b939d00ee21d..fbf229ccc932c23343496fd475e07f5195138509 100644 --- a/web/themes/asc_bootstrap/templates/system/user.html.twig +++ b/web/themes/asc_bootstrap/templates/system/user.html.twig @@ -139,6 +139,17 @@ {% endif %} {% endfor %} {% endif %} + {% if content.field_other.0 != '' %} + {% for item in content.field_other %} + {% if item['#title'] %} + <div class="research-interests-ppl"> + <a href="/people?field_other_target_id[{{ item['#url']|render|split('/')|last }}]={{ item['#url']|render|split('/')|last }}"> + {{ item['#title'] }} + </a> + </div> + {% endif %} + {% endfor %} + {% endif %} </div> </article>