diff --git a/web/themes/asc_bootstrap/asc_bootstrap.info.yml b/web/themes/asc_bootstrap/asc_bootstrap.info.yml index d9e4e856244cf403c44516c3e432a81b2aad4d06..c01b0f584b3b61a5a4984d88f587e935018ed8bd 100755 --- a/web/themes/asc_bootstrap/asc_bootstrap.info.yml +++ b/web/themes/asc_bootstrap/asc_bootstrap.info.yml @@ -25,7 +25,7 @@ libraries: - 'asc_bootstrap/global-styling' - 'asc_bootstrap/bootstrap-scripts' - 'asc_bootstrap/osu-webfonts' - #- 'asc_bootstrap/font-awesome' + - 'asc_bootstrap/font-awesome' ckeditor_stylesheets: - css/style.css diff --git a/web/themes/asc_bootstrap/asc_bootstrap.libraries.yml b/web/themes/asc_bootstrap/asc_bootstrap.libraries.yml index c006043c0e5bb659220e8e022c48f5e1906129f3..317a5bbec4ee65bf0539a734c68cefb84d8405c2 100755 --- a/web/themes/asc_bootstrap/asc_bootstrap.libraries.yml +++ b/web/themes/asc_bootstrap/asc_bootstrap.libraries.yml @@ -42,7 +42,7 @@ bootstrap-scripts: assets/javascripts/bootstrap/scrollspy.js: {} assets/javascripts/bootstrap/tab.js: {} assets/javascripts/bootstrap/transition.js: {} - //use.fontawesome.com/releases/v5.2.0/js/all.js: { type: external, minified: true } + #//use.fontawesome.com/releases/v5.2.0/js/all.js: { type: external, minified: true } osu-webfonts: @@ -55,13 +55,13 @@ osu-webfonts: theme: https://www.osu.edu/assets/fonts/webfonts.css: { type: external, minified: false } -#font-awesome: -# remote: https://fortawesome.github.io/Font-Awesome/ -# version: 4.5.0 -# license: -# name: MIT -# url: https://fortawesome.github.io/Font-Awesome/license/ -# gpl-compatible: true -# css: -# theme: -# https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css: { type: external, minified: true } +font-awesome: + remote: https://fortawesome.github.io/Font-Awesome/ + version: 4.5.0 + license: + name: MIT + url: https://fortawesome.github.io/Font-Awesome/license/ + gpl-compatible: true + css: + theme: + https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css: { type: external, minified: true } diff --git a/web/themes/asc_bootstrap/asc_bootstrap.theme b/web/themes/asc_bootstrap/asc_bootstrap.theme index d4900c6e67b141d4540b0886ce57e6082a9c0004..d201b66d324e1dffc69614421e65ea1634a459d2 100755 --- a/web/themes/asc_bootstrap/asc_bootstrap.theme +++ b/web/themes/asc_bootstrap/asc_bootstrap.theme @@ -10,6 +10,9 @@ function asc_bootstrap_preprocess_page(&$vars, $hook) { // Render the library as laid out in herchel.libraries.yml $libraries['#attached']['library'][] = 'asc_bootstrap/asc_bootstrap-corescripts'; drupal_render($libraries); + + //adds site name variable which is used as logo alt and title text + $vars['site_name'] = \Drupal::config('system.site')->get('name'); } //create another suggestion based on the block type diff --git a/web/themes/asc_bootstrap/assets/sass/components/_people.scss b/web/themes/asc_bootstrap/assets/sass/components/_people.scss index 012d40dd1b856f3c4b53a6915b17f6973ddab482..4e73c463aa230832f510ce7245a774649fdb583e 100644 --- a/web/themes/asc_bootstrap/assets/sass/components/_people.scss +++ b/web/themes/asc_bootstrap/assets/sass/components/_people.scss @@ -140,10 +140,11 @@ .bio-header-top { background: #F9F9F9; - .field--name-user-picture { + .bio-top-right { img { padding: 15px 0; + width: 100%; } } diff --git a/web/themes/asc_bootstrap/assets/sass/layout/_footer.scss b/web/themes/asc_bootstrap/assets/sass/layout/_footer.scss index 68e2e45e80985884195cfcef8fafaefafa2e3252..963d34b03cad7f47293c1b1f1f3336ec72dbd678 100644 --- a/web/themes/asc_bootstrap/assets/sass/layout/_footer.scss +++ b/web/themes/asc_bootstrap/assets/sass/layout/_footer.scss @@ -9,7 +9,7 @@ background: #173E41; border-top: none; color: $white; - margin-top: 30px; + margin-top: 0; a { color: $white; @@ -51,50 +51,52 @@ // Social Media // -------------------------------------------------- -.fa-twitter:before { - content: "\f081"; -} +.social-media-links--platforms { + .fa-twitter:before { + content: "\f081"; + } -.fa-facebook:before { - content: "\f082"; -} + .fa-facebook:before { + content: "\f082"; + } -.fa-rss:before { - content: "\f143"; -} + .fa-rss:before { + content: "\f143"; + } -.fa-youtube:before { - content: "\f166"; -} + .fa-youtube:before { + content: "\f166"; + } -.fa-linkedin:before { - content: "\f08c"; -} + .fa-linkedin:before { + content: "\f08c"; + } -.fa-envelope:before { - content: "\f199"; -} + .fa-envelope:before { + content: "\f199"; + } -.fa-github:before { - content: "\f092"; -} + .fa-github:before { + content: "\f092"; + } -.fa-bitbucket:before { - content: "\f172"; -} + .fa-bitbucket:before { + content: "\f172"; + } -.fa-tumblr:before { - content: "\f174"; -} + .fa-tumblr:before { + content: "\f174"; + } -.fa-behance:before { - content: "\f1b5"; -} + .fa-behance:before { + content: "\f1b5"; + } -.fa-pinterest:before { - content: "\f0d3"; -} + .fa-pinterest:before { + content: "\f0d3"; + } -.fa-google-plus:before { - content: "\f0d4"; + .fa-google-plus:before { + content: "\f0d4"; + } } diff --git a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss index a935cb40b5426e3643c9270645714493c2a711a1..9e0971aa4f423344dbd7cf09519c5a0f55ab8417 100644 --- a/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss +++ b/web/themes/asc_bootstrap/assets/sass/pages/_landing-page.scss @@ -5,6 +5,40 @@ // Landing Page // -------------------------------------------------- +.page-node-type-landing-page { + + .page-header { + display: none; + } + + .breadcrumb { + background-color: transparent; + padding: 0 0 0 15px; + } +} + + +.landing-page-title-head { + background-color: #1B494C; + color: $white; + padding: 20px 0; + + h1 { + color: $white; + padding-left: 15px; + } + + a { + color: $white; + } + + .active { + color: $white; + font-weight: bold; + } +} + + //## Carousel. .landing-page .carousel { @@ -35,6 +69,10 @@ p { font-size: 36px; line-height: 1; + + @media (max-width: 768px) { + font-size: 24px; + } } } } @@ -217,3 +255,9 @@ } +#views-bootstrap-people-directory-block-1 { + .people-row .inner-people-grid { + background: $white; + } +} + diff --git a/web/themes/asc_bootstrap/css/style.css b/web/themes/asc_bootstrap/css/style.css index e953c7fab2de0df6486bdbf8d1ae79e69618d5ff..0f8902022b43d0e4ee739065c5549c59457a646b 100644 --- a/web/themes/asc_bootstrap/css/style.css +++ b/web/themes/asc_bootstrap/css/style.css @@ -2083,7 +2083,7 @@ aside .col-sm-3 { background: #173E41; border-top: none; color: #ffffff; - margin-top: 30px; + margin-top: 0; } /* line 14, ../assets/sass/layout/_footer.scss */ .footer a { @@ -2121,63 +2121,52 @@ aside .col-sm-3 { } } -/* line 54, ../assets/sass/layout/_footer.scss */ -.fa-twitter:before { +/* line 55, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-twitter:before { content: "\f081"; } - -/* line 58, ../assets/sass/layout/_footer.scss */ -.fa-facebook:before { +/* line 59, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-facebook:before { content: "\f082"; } - -/* line 62, ../assets/sass/layout/_footer.scss */ -.fa-rss:before { +/* line 63, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-rss:before { content: "\f143"; } - -/* line 66, ../assets/sass/layout/_footer.scss */ -.fa-youtube:before { +/* line 67, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-youtube:before { content: "\f166"; } - -/* line 70, ../assets/sass/layout/_footer.scss */ -.fa-linkedin:before { +/* line 71, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-linkedin:before { content: "\f08c"; } - -/* line 74, ../assets/sass/layout/_footer.scss */ -.fa-envelope:before { +/* line 75, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-envelope:before { content: "\f199"; } - -/* line 78, ../assets/sass/layout/_footer.scss */ -.fa-github:before { +/* line 79, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-github:before { content: "\f092"; } - -/* line 82, ../assets/sass/layout/_footer.scss */ -.fa-bitbucket:before { +/* line 83, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-bitbucket:before { content: "\f172"; } - -/* line 86, ../assets/sass/layout/_footer.scss */ -.fa-tumblr:before { +/* line 87, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-tumblr:before { content: "\f174"; } - -/* line 90, ../assets/sass/layout/_footer.scss */ -.fa-behance:before { +/* line 91, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-behance:before { content: "\f1b5"; } - -/* line 94, ../assets/sass/layout/_footer.scss */ -.fa-pinterest:before { +/* line 95, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-pinterest:before { content: "\f0d3"; } - -/* line 98, ../assets/sass/layout/_footer.scss */ -.fa-google-plus:before { +/* line 99, ../assets/sass/layout/_footer.scss */ +.social-media-links--platforms .fa-google-plus:before { content: "\f0d4"; } @@ -6829,39 +6818,40 @@ article .field--name-body { background: #F9F9F9; } /* line 145, ../assets/sass/components/_people.scss */ -.bio-header-top .field--name-user-picture img { +.bio-header-top .bio-top-right img { padding: 15px 0; + width: 100%; } -/* line 152, ../assets/sass/components/_people.scss */ +/* line 153, ../assets/sass/components/_people.scss */ .bio-header-top .field--name-field-google-map-location .field--item { padding: 20px 0; } -/* line 155, ../assets/sass/components/_people.scss */ +/* line 156, ../assets/sass/components/_people.scss */ .bio-header-top .field--name-field-google-map-location .field--item .geolocation-formatter-map-wrapper { border: solid 2px #979797; } -/* line 162, ../assets/sass/components/_people.scss */ +/* line 163, ../assets/sass/components/_people.scss */ .bio-header { width: 100%; float: left; margin: 0 0 20px; } -/* line 168, ../assets/sass/components/_people.scss */ +/* line 169, ../assets/sass/components/_people.scss */ .bio-btm-left { margin-bottom: 40px; } -/* line 171, ../assets/sass/components/_people.scss */ +/* line 172, ../assets/sass/components/_people.scss */ .bio-btm-left h2 { font-size: 22px; } -/* line 175, ../assets/sass/components/_people.scss */ +/* line 176, ../assets/sass/components/_people.scss */ .bio-btm-left .bio-exp { padding-left: 0; } -/* line 181, ../assets/sass/components/_people.scss */ +/* line 182, ../assets/sass/components/_people.scss */ .bio-btm-right h3 { font-size: 18px; padding-top: 20px; @@ -10851,58 +10841,95 @@ button.close { } } /* line 10, ../assets/sass/pages/_landing-page.scss */ +.page-node-type-landing-page .page-header { + display: none; +} +/* line 14, ../assets/sass/pages/_landing-page.scss */ +.page-node-type-landing-page .breadcrumb { + background-color: transparent; + padding: 0 0 0 15px; +} + +/* line 21, ../assets/sass/pages/_landing-page.scss */ +.landing-page-title-head { + background-color: #1B494C; + color: #ffffff; + padding: 20px 0; +} +/* line 26, ../assets/sass/pages/_landing-page.scss */ +.landing-page-title-head h1 { + color: #ffffff; + padding-left: 15px; +} +/* line 31, ../assets/sass/pages/_landing-page.scss */ +.landing-page-title-head a { + color: #ffffff; +} +/* line 35, ../assets/sass/pages/_landing-page.scss */ +.landing-page-title-head .active { + color: #ffffff; + font-weight: bold; +} + +/* line 44, ../assets/sass/pages/_landing-page.scss */ .landing-page .carousel { height: auto; overflow: hidden; } -/* line 14, ../assets/sass/pages/_landing-page.scss */ +/* line 48, ../assets/sass/pages/_landing-page.scss */ .landing-page .carousel .field--name-field-media-image { padding-bottom: 0; } @media (max-width: 1030px) { - /* line 10, ../assets/sass/pages/_landing-page.scss */ + /* line 44, ../assets/sass/pages/_landing-page.scss */ .landing-page .carousel { height: auto; } } -/* line 28, ../assets/sass/pages/_landing-page.scss */ +/* line 62, ../assets/sass/pages/_landing-page.scss */ #sht-desc { margin: 40px 0; } -/* line 31, ../assets/sass/pages/_landing-page.scss */ +/* line 65, ../assets/sass/pages/_landing-page.scss */ #sht-desc h2 { margin: 0 auto !important; text-align: center; float: none; } -/* line 35, ../assets/sass/pages/_landing-page.scss */ +/* line 69, ../assets/sass/pages/_landing-page.scss */ #sht-desc h2 p { font-size: 36px; line-height: 1; } +@media (max-width: 768px) { + /* line 69, ../assets/sass/pages/_landing-page.scss */ + #sht-desc h2 p { + font-size: 24px; + } +} -/* line 42, ../assets/sass/pages/_landing-page.scss */ +/* line 80, ../assets/sass/pages/_landing-page.scss */ .stats { text-align: center; } -/* line 46, ../assets/sass/pages/_landing-page.scss */ +/* line 84, ../assets/sass/pages/_landing-page.scss */ .stat-num { font-size: 72px; } -/* line 50, ../assets/sass/pages/_landing-page.scss */ +/* line 88, ../assets/sass/pages/_landing-page.scss */ .stat-desc { font-size: 20px; } -/* line 54, ../assets/sass/pages/_landing-page.scss */ +/* line 92, ../assets/sass/pages/_landing-page.scss */ .stat-desc:nth-child(odd) { float: right; } -/* line 66, ../assets/sass/pages/_landing-page.scss */ +/* line 104, ../assets/sass/pages/_landing-page.scss */ .call-out-container .field--name-field-image-link a { color: #000000; font-size: 20px; @@ -10910,13 +10937,13 @@ button.close { padding-top: 5px; font-weight: 600; } -/* line 73, ../assets/sass/pages/_landing-page.scss */ +/* line 111, ../assets/sass/pages/_landing-page.scss */ .call-out-container .field--name-field-image-link a:hover { color: #BB0000; text-decoration: underline; } -/* line 91, ../assets/sass/pages/_landing-page.scss */ +/* line 129, ../assets/sass/pages/_landing-page.scss */ .dgray-bg .call-out-container a, .dscarlet-bg .call-out-container a, .dviolet-bg .call-out-container a, @@ -10926,7 +10953,7 @@ button.close { .dorange-bg .call-out-container a { color: #ffffff; } -/* line 94, ../assets/sass/pages/_landing-page.scss */ +/* line 132, ../assets/sass/pages/_landing-page.scss */ .dgray-bg .call-out-container a:hover, .dscarlet-bg .call-out-container a:hover, .dviolet-bg .call-out-container a:hover, @@ -10937,7 +10964,7 @@ button.close { color: #ffffff; } -/* line 103, ../assets/sass/pages/_landing-page.scss */ +/* line 141, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-left { position: absolute; z-index: 2; @@ -10948,12 +10975,12 @@ button.close { border-right: 20px solid transparent; } @media (max-width: 768px) { - /* line 103, ../assets/sass/pages/_landing-page.scss */ + /* line 141, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-left { bottom: -2px; } } -/* line 116, ../assets/sass/pages/_landing-page.scss */ +/* line 154, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-right { position: absolute; z-index: 2; @@ -10965,18 +10992,18 @@ button.close { border-left: 20px solid transparent; } @media (max-width: 768px) { - /* line 116, ../assets/sass/pages/_landing-page.scss */ + /* line 154, ../assets/sass/pages/_landing-page.scss */ .page-node-type-landing-page #half-t-right { bottom: -2px; } } -/* line 137, ../assets/sass/pages/_landing-page.scss */ +/* line 175, ../assets/sass/pages/_landing-page.scss */ .block-bg-color { background: #F5F5F5; } -/* line 142, ../assets/sass/pages/_landing-page.scss */ +/* line 180, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header { text-transform: uppercase; float: left; @@ -10985,48 +11012,48 @@ button.close { padding-bottom: 0; border-bottom: 1px solid #979797; } -/* line 150, ../assets/sass/pages/_landing-page.scss */ +/* line 188, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-re-news { text-align: left; padding: 0; } -/* line 154, ../assets/sass/pages/_landing-page.scss */ +/* line 192, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-re-news h2 { color: #851E5E; font-size: 22px; } -/* line 160, ../assets/sass/pages/_landing-page.scss */ +/* line 198, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head { text-align: right; padding: 0; } -/* line 164, ../assets/sass/pages/_landing-page.scss */ +/* line 202, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head h3, .view-display-id-block_1 .view-header .txt-more-news-head a { color: #851E5E; font-size: 22px; } -/* line 168, ../assets/sass/pages/_landing-page.scss */ +/* line 206, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head h3 svg, .view-display-id-block_1 .view-header .txt-more-news-head a svg { font-size: 20px; } @media (max-width: 768px) { - /* line 160, ../assets/sass/pages/_landing-page.scss */ + /* line 198, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-header .txt-more-news-head { display: none; } } -/* line 179, ../assets/sass/pages/_landing-page.scss */ +/* line 217, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-content { float: left; width: 100%; } @media (max-width: 768px) { - /* line 184, ../assets/sass/pages/_landing-page.scss */ + /* line 222, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-content .row { margin-bottom: 0; } } -/* line 190, ../assets/sass/pages/_landing-page.scss */ +/* line 228, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer { text-transform: uppercase; float: left; @@ -11035,27 +11062,32 @@ button.close { border-bottom: 1px solid #979797; display: none; } -/* line 198, ../assets/sass/pages/_landing-page.scss */ +/* line 236, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer .txt-more-news-foot { text-align: right; padding: 0; } -/* line 202, ../assets/sass/pages/_landing-page.scss */ +/* line 240, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer .txt-more-news-foot h3, .view-display-id-block_1 .view-footer .txt-more-news-foot a { color: #851E5E; font-size: 22px; } -/* line 206, ../assets/sass/pages/_landing-page.scss */ +/* line 244, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer .txt-more-news-foot h3 svg, .view-display-id-block_1 .view-footer .txt-more-news-foot a svg { font-size: 20px; } @media (max-width: 768px) { - /* line 190, ../assets/sass/pages/_landing-page.scss */ + /* line 228, ../assets/sass/pages/_landing-page.scss */ .view-display-id-block_1 .view-footer { display: block; } } +/* line 259, ../assets/sass/pages/_landing-page.scss */ +#views-bootstrap-people-directory-block-1 .people-row .inner-people-grid { + background: #ffffff; +} + /* line 10, ../assets/sass/pages/_basic-page.scss */ .page-node-type-page .carousel { height: auto; diff --git a/web/themes/asc_bootstrap/templates/system/includes/_header.twig b/web/themes/asc_bootstrap/templates/system/includes/_header.twig index cda7da98cc9dce660b0e38b9811efeaffbc84457..113afedaae2e707157a83b1ce7e93e43b872e75e 100644 --- a/web/themes/asc_bootstrap/templates/system/includes/_header.twig +++ b/web/themes/asc_bootstrap/templates/system/includes/_header.twig @@ -27,7 +27,7 @@ <div class="container"> <div id="header-logos"> <a href="/" class="dep-logo"> - <img alt="Demo logo" title="Demo logo" src="/sites/default/files/logos/department-logo.svg" /> + <img alt="{{ site_name }}" title="{{ site_name }}" src="/sites/default/files/logos/department-logo.svg" /> </a> <a href="https://artsandsciences.osu.edu/" class="osu-logo"> <img alt="College of Arts and Sciences logo" title="College of Arts and Sciences logo" src="/sites/default/files/logos/asc-logo.svg" onerror="this.style.display='none'" /> @@ -44,7 +44,7 @@ <img alt="The Ohio State University logo" title="The Ohio State University logo" src="/sites/default/files/logos/osu-logo-mobile.svg" onerror="this.style.display='none'" /> </a> <a href="/" class="dep-logo"> - <img alt="Demo logo" title="Demo logo" src="/sites/default/files/logos/department-logo-mobile.svg" /> + <img alt="{{ site_name }}" title="{{ site_name }}" src="/sites/default/files/logos/department-logo-mobile.svg" /> </a> </div> </div> diff --git a/web/themes/asc_bootstrap/templates/system/page--landing-page.html.twig b/web/themes/asc_bootstrap/templates/system/page--landing-page.html.twig index f871a44e8dc9415be7663e82e7d15c920344cadb..fd1cb0f943b5402944e0dcfd26a3a6a07f13e5c6 100644 --- a/web/themes/asc_bootstrap/templates/system/page--landing-page.html.twig +++ b/web/themes/asc_bootstrap/templates/system/page--landing-page.html.twig @@ -59,7 +59,15 @@ <a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #} <div class="layout-content"> - {{ page.content }} + {% if not is_front %} + <div class="landing-page-title-head"> + <div class="container"> + {{ page.breadcrumb }} + <h1>{{ node.label }}</h1> + </div> + </div> + {% endif %} + {{ page.content|without('title') }} {{ page.events }} {{ page.news }} {{ page.people }} diff --git a/web/themes/asc_bootstrap/templates/system/user.html.twig b/web/themes/asc_bootstrap/templates/system/user.html.twig index f5f838770f868f5999f9e714bbd9a37701ccf88d..93fcb0157e29ac904b8b4ccd0954d15b1624134f 100644 --- a/web/themes/asc_bootstrap/templates/system/user.html.twig +++ b/web/themes/asc_bootstrap/templates/system/user.html.twig @@ -21,7 +21,13 @@ <article{{ attributes }}> <div class="bio-header bio-header-top"> <div class="col-xs-12 col-sm-3 bio-top-right"> - {{ content.user_picture }} + {% if (content.user_picture.0 != '') and (user.field_use_opic.value == false) %} + {{ content.user_picture }} + {% elseif user.field_use_opic.value %} + <img src="https://opic.osu.edu/{{ content.field_osu_name_num.0 }}?aspect=p&width=300" alt="{{ content.field_first_name.0 }} {{ content.field_last_name.0 }}" /> + {% else %} + <img src="" title="no image"/> + {% endif %} </div> <div class="col-xs-12 col-sm-5 bio-top-left"> <h1> diff --git a/web/themes/asc_bootstrap/templates/views/views-exposed-form.html.twig b/web/themes/asc_bootstrap/templates/views/views-exposed-form.html.twig old mode 100644 new mode 100755 diff --git a/web/themes/asc_bootstrap/templates/views/views-view-unformatted.html.twig b/web/themes/asc_bootstrap/templates/views/views-view-unformatted.html.twig old mode 100644 new mode 100755