Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • asc-web-services/drupal-upstream
1 result
Show changes
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
h1 { h1 {
color: $white; color: $white;
padding-left: 15px; padding-left: 15px;
font-family: 'BuckeyeSerifSemiBold';
} }
a { a {
......
...@@ -6049,10 +6049,11 @@ hr { ...@@ -6049,10 +6049,11 @@ hr {
h1, h2, h3, h4, h5, h6 { h1, h2, h3, h4, h5, h6 {
margin: 11px 0; margin: 11px 0;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; } -moz-osx-font-smoothing: grayscale;
font-weight: normal; }
h1 { h1 {
font-size: 2.625rem; font-size: 2.5rem;
line-height: 1.2; line-height: 1.2;
font-family: 'BuckeyeSerifBlack'; font-family: 'BuckeyeSerifBlack';
color: #212325; } color: #212325; }
...@@ -6175,6 +6176,8 @@ figcaption { ...@@ -6175,6 +6176,8 @@ figcaption {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
font-size: 20px; font-size: 20px;
font-weight: 600; } font-weight: 600; }
.footer .footer-address .contact-heading a {
text-decoration: none; }
.footer .footer-email a { .footer .footer-email a {
text-decoration: underline; } text-decoration: underline; }
...@@ -6262,7 +6265,7 @@ figcaption { ...@@ -6262,7 +6265,7 @@ figcaption {
content: "\f0d3"; } content: "\f0d3"; }
#header-logos { #header-logos {
padding: 0 15px; padding: 20px 15px;
max-width: fit-content; max-width: fit-content;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
...@@ -6275,15 +6278,21 @@ figcaption { ...@@ -6275,15 +6278,21 @@ figcaption {
#header-logos a:hover { #header-logos a:hover {
text-decoration: none; text-decoration: none;
color: #BA0C2F; } color: #BA0C2F; }
@media (max-width: 768px) {
#header-logos {
padding: 20px 15px;
height: auto; } }
.unit-name { .unit-name {
color: #212325; color: #212325;
font-size: 3rem; font-size: 2rem;
line-height: 2.5rem;
font-family: 'BuckeyeSansBlack'; } font-family: 'BuckeyeSansBlack'; }
.parent-name { .parent-name {
color: #212325; color: #212325;
font-size: 1.5rem; } font-size: 1.25rem;
line-height: 1.625rem; }
.breadcrumb > .active { .breadcrumb > .active {
color: #544F4F; } color: #544F4F; }
...@@ -6296,6 +6305,11 @@ figcaption { ...@@ -6296,6 +6305,11 @@ figcaption {
.breadcrumb a, .breadcrumb li { .breadcrumb a, .breadcrumb li {
font-family: 'BuckeyeSansRegular'; } font-family: 'BuckeyeSansRegular'; }
.bux-osu-nav__link {
font-family: 'BuckeyeSansSemiBold'; }
.bux-osu-nav__link a {
font-weight: normal; }
.search-block-form { .search-block-form {
display: none; display: none;
width: 50%; width: 50%;
...@@ -6382,6 +6396,8 @@ figcaption { ...@@ -6382,6 +6396,8 @@ figcaption {
color: #000000; } color: #000000; }
.lgray-bg .sec-title { .lgray-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lgray-bg .btn-fullw {
background-color: #ffffff; }
.lblue-bg { .lblue-bg {
background-color: #e9eff7; background-color: #e9eff7;
...@@ -6401,6 +6417,8 @@ figcaption { ...@@ -6401,6 +6417,8 @@ figcaption {
color: #000000; } color: #000000; }
.lblue-bg .sec-title { .lblue-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lblue-bg .btn-fullw {
background-color: #ffffff; }
.lviolet-bg { .lviolet-bg {
background-color: #f3e9ef; background-color: #f3e9ef;
...@@ -6420,6 +6438,8 @@ figcaption { ...@@ -6420,6 +6438,8 @@ figcaption {
color: #000000; } color: #000000; }
.lviolet-bg .sec-title { .lviolet-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lviolet-bg .btn-fullw {
background-color: #ffffff; }
.ltaupe-bg { .ltaupe-bg {
background-color: #f5f5ee; background-color: #f5f5ee;
...@@ -6439,6 +6459,8 @@ figcaption { ...@@ -6439,6 +6459,8 @@ figcaption {
color: #000000; } color: #000000; }
.ltaupe-bg .sec-title { .ltaupe-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.ltaupe-bg .btn-fullw {
background-color: #ffffff; }
.lturquoise-bg { .lturquoise-bg {
background-color: #f1f8f7; background-color: #f1f8f7;
...@@ -6458,6 +6480,8 @@ figcaption { ...@@ -6458,6 +6480,8 @@ figcaption {
color: #000000; } color: #000000; }
.lturquoise-bg .sec-title { .lturquoise-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lturquoise-bg .btn-fullw {
background-color: #ffffff; }
.lteal-bg { .lteal-bg {
background-color: #eaf0f1; background-color: #eaf0f1;
...@@ -6477,6 +6501,8 @@ figcaption { ...@@ -6477,6 +6501,8 @@ figcaption {
color: #000000; } color: #000000; }
.lteal-bg .sec-title { .lteal-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lteal-bg .btn-fullw {
background-color: #ffffff; }
.lyellow-bg { .lyellow-bg {
background-color: #f6f9da; background-color: #f6f9da;
...@@ -6496,6 +6522,8 @@ figcaption { ...@@ -6496,6 +6522,8 @@ figcaption {
color: #000000; } color: #000000; }
.lyellow-bg .sec-title { .lyellow-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
.lyellow-bg .btn-fullw {
background-color: #ffffff; }
.dgray-bg { .dgray-bg {
background-color: #212325; background-color: #212325;
...@@ -6530,9 +6558,17 @@ figcaption { ...@@ -6530,9 +6558,17 @@ figcaption {
.dgray-bg .field--name-field-callout-link a:hover { .dgray-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dgray-bg .btn-fullw { .dgray-bg .btn-fullw {
border: solid #ffffff 2px; } background-color: #ffffff;
color: #212325;
border: solid #ffffff 2px;
text-decoration: none; }
.dgray-bg .btn-fullw:hover { .dgray-bg .btn-fullw:hover {
border: solid #212325 2px; } color: #ffffff;
background-color: #BA0C2F; }
.dgray-bg .btn-fullw-red:hover {
background-color: #ffffff;
color: #212325;
border: solid #ffffff 2px; }
.dgray-bg .sec-title { .dgray-bg .sec-title {
margin-top: 20px; } margin-top: 20px; }
...@@ -6569,7 +6605,9 @@ figcaption { ...@@ -6569,7 +6605,9 @@ figcaption {
.dscarlet-bg .field--name-field-callout-link a:hover { .dscarlet-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dscarlet-bg .btn-fullw { .dscarlet-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dscarlet-bg .btn-fullw:hover { .dscarlet-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dscarlet-bg .sec-title { .dscarlet-bg .sec-title {
...@@ -6608,7 +6646,9 @@ figcaption { ...@@ -6608,7 +6646,9 @@ figcaption {
.dviolet-bg .field--name-field-callout-link a:hover { .dviolet-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dviolet-bg .btn-fullw { .dviolet-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dviolet-bg .btn-fullw:hover { .dviolet-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dviolet-bg .sec-title { .dviolet-bg .sec-title {
...@@ -6647,7 +6687,9 @@ figcaption { ...@@ -6647,7 +6687,9 @@ figcaption {
.dteal-bg .field--name-field-callout-link a:hover { .dteal-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dteal-bg .btn-fullw { .dteal-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dteal-bg .btn-fullw:hover { .dteal-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dteal-bg .sec-title { .dteal-bg .sec-title {
...@@ -6686,7 +6728,9 @@ figcaption { ...@@ -6686,7 +6728,9 @@ figcaption {
.dpurple-bg .field--name-field-callout-link a:hover { .dpurple-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dpurple-bg .btn-fullw { .dpurple-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dpurple-bg .btn-fullw:hover { .dpurple-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dpurple-bg .sec-title { .dpurple-bg .sec-title {
...@@ -6725,7 +6769,9 @@ figcaption { ...@@ -6725,7 +6769,9 @@ figcaption {
.dgreen-bg .field--name-field-callout-link a:hover { .dgreen-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dgreen-bg .btn-fullw { .dgreen-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dgreen-bg .btn-fullw:hover { .dgreen-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dgreen-bg .sec-title { .dgreen-bg .sec-title {
...@@ -6764,7 +6810,9 @@ figcaption { ...@@ -6764,7 +6810,9 @@ figcaption {
.dorange-bg .field--name-field-callout-link a:hover { .dorange-bg .field--name-field-callout-link a:hover {
color: #ffffff; } color: #ffffff; }
.dorange-bg .btn-fullw { .dorange-bg .btn-fullw {
border: solid #ffffff 2px; } border: solid #ffffff 2px;
color: #ffffff;
text-decoration: none; }
.dorange-bg .btn-fullw:hover { .dorange-bg .btn-fullw:hover {
border: solid #212325 2px; } border: solid #212325 2px; }
.dorange-bg .sec-title { .dorange-bg .sec-title {
...@@ -7381,12 +7429,12 @@ article.event { ...@@ -7381,12 +7429,12 @@ article.event {
margin: 0 auto; } margin: 0 auto; }
.field--name-field-pull-quote { .field--name-field-pull-quote {
border-top: solid 2px #26686D; font-family: 'BuckeyeSerifBold';
border-bottom: solid 2px #26686D; font-size: 1.5rem;
font-size: 20px; line-height: 2.25rem;
font-family: 'Capita', Times, serif; margin: 0;
font-weight: 400; padding: 0;
padding: 5px; } color: #212325; }
article .field--name-body { article .field--name-body {
margin: 20px 0; } margin: 20px 0; }
...@@ -8250,7 +8298,8 @@ article .field--name-body { ...@@ -8250,7 +8298,8 @@ article .field--name-body {
display: block; } } display: block; } }
#main-nav li { #main-nav li {
font-family: 'BuckeyeSansBold'; font-family: 'BuckeyeSansBold';
color: #212325; } color: #212325;
font-weight: normal; }
.dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus { .dropdown-menu > .active > a, .dropdown-menu > .active > a:hover, .dropdown-menu > .active > a:focus {
background: transparent; background: transparent;
...@@ -9058,7 +9107,7 @@ article.news-story { ...@@ -9058,7 +9107,7 @@ article.news-story {
.btn-par { .btn-par {
font-family: 'BuckeyeSansSemiBold'; font-family: 'BuckeyeSansSemiBold';
text-transform: capitalize; text-transform: none;
white-space: initial; } white-space: initial; }
.btn-par .fa-angle-right { .btn-par .fa-angle-right {
margin-left: 10px; margin-left: 10px;
...@@ -9225,7 +9274,7 @@ article.news-story { ...@@ -9225,7 +9274,7 @@ article.news-story {
color: #ffffff; color: #ffffff;
background: #BA0C2F; background: #BA0C2F;
padding: 10px 15px; padding: 10px 15px;
text-transform: capitalize; text-transform: none;
font-family: 'BuckeyeSansBold'; } font-family: 'BuckeyeSansBold'; }
.call-out-adv-container .field--name-field-av-cb-link a:hover { .call-out-adv-container .field--name-field-av-cb-link a:hover {
text-decoration: none; text-decoration: none;
...@@ -9327,7 +9376,7 @@ article.news-story { ...@@ -9327,7 +9376,7 @@ article.news-story {
background: #BA0C2F; background: #BA0C2F;
padding: 10px; padding: 10px;
font-weight: 600; font-weight: 600;
text-transform: uppercase; } text-transform: none; }
@media (max-width: 768px) { @media (max-width: 768px) {
.cb-h .cb-h-r .field--name-field-cb-h-button a { .cb-h .cb-h-r .field--name-field-cb-h-button a {
width: 100%; width: 100%;
...@@ -9363,7 +9412,10 @@ article.news-story { ...@@ -9363,7 +9412,10 @@ article.news-story {
color: #BA0C2F; } color: #BA0C2F; }
.paragraph--type--pull-quote { .paragraph--type--pull-quote {
padding: 20px; } padding: 11px 22px;
margin: 30px;
font-size: 20px;
border-left: 5px solid #BA0C2F; }
.slide-txt-container { .slide-txt-container {
width: 100%; width: 100%;
...@@ -9596,14 +9648,12 @@ article.news-story { ...@@ -9596,14 +9648,12 @@ article.news-story {
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name, .view-people-directory .people-row .inner-people-grid .views-field-field-first-name,
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name { .view-people-directory .people-row .inner-people-grid .views-field-field-last-name {
font-family: 'BuckeyeSansBold'; font-family: 'BuckeyeSansBold';
font-size: 18px; } font-size: 18px;
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name a, color: #212325; }
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name a { .view-people-directory .people-row .inner-people-grid .views-field-field-first-name:hover,
color: #212325; } .view-people-directory .people-row .inner-people-grid .views-field-field-last-name:hover {
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name a:hover, color: #BA0C2F;
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name a:hover { text-decoration: none; }
color: #BA0C2F;
text-decoration: none; }
@media (max-width: 768px) { @media (max-width: 768px) {
.view-people-directory .people-row .inner-people-grid .views-field-field-first-name, .view-people-directory .people-row .inner-people-grid .views-field-field-first-name,
.view-people-directory .people-row .inner-people-grid .views-field-field-last-name { .view-people-directory .people-row .inner-people-grid .views-field-field-last-name {
...@@ -9686,7 +9736,7 @@ article.news-story { ...@@ -9686,7 +9736,7 @@ article.news-story {
font-size: 18px; font-size: 18px;
padding-top: 20px; } padding-top: 20px; }
.profile_social { .profile-social {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
gap: 10px; } gap: 10px; }
...@@ -9937,11 +9987,12 @@ body { ...@@ -9937,11 +9987,12 @@ body {
aside .sidebar-nav { aside .sidebar-nav {
width: 100%; } width: 100%; }
aside .sidebar-nav li { aside .sidebar-nav li {
border-top: 2px solid #eff1f2;
line-height: 1.15; line-height: 1.15;
float: left; float: left;
width: 100%; } width: 100%; }
aside .sidebar-nav li .link-wrapper { aside .sidebar-nav li .link-wrapper {
padding: 8px 0; } padding: 15px 0; }
aside .sidebar-nav li .link-wrapper:hover { aside .sidebar-nav li .link-wrapper:hover {
padding-left: 5px; padding-left: 5px;
border-left: 3px solid #212325; border-left: 3px solid #212325;
...@@ -10013,6 +10064,8 @@ aside h2.active-link { ...@@ -10013,6 +10064,8 @@ aside h2.active-link {
padding-left: 0; } padding-left: 0; }
aside h2 a { aside h2 a {
color: #000000; } color: #000000; }
aside .nav {
border-bottom: 2px solid #eff1f2; }
@media (max-width: 768px) { @media (max-width: 768px) {
aside { aside {
width: 100%; } } width: 100%; } }
...@@ -10129,8 +10182,8 @@ form { ...@@ -10129,8 +10182,8 @@ form {
-moz-user-select: none; -moz-user-select: none;
-ms-user-select: none; -ms-user-select: none;
user-select: none; user-select: none;
text-transform: capitalize; text-transform: none;
font-family: 'BuckeyeSansRegular'; } font-family: 'BuckeyeSansBold'; }
.btn-wysiwyg .fa-angle-right { .btn-wysiwyg .fa-angle-right {
margin-left: 10px; } margin-left: 10px; }
.btn-wysiwyg:hover { .btn-wysiwyg:hover {
...@@ -10197,6 +10250,9 @@ article.page { ...@@ -10197,6 +10250,9 @@ article.page {
background: #212325; background: #212325;
color: #ffffff; color: #ffffff;
padding: 20px; } padding: 20px; }
.page-node-type-page .carousel .field--name-field-image-caption p {
font-family: "BuckeyeSansRegular";
color: #ffffff; }
@media (max-width: 1030px) { @media (max-width: 1030px) {
.page-node-type-page .carousel { .page-node-type-page .carousel {
height: auto; } } height: auto; } }
...@@ -10220,7 +10276,8 @@ article.page { ...@@ -10220,7 +10276,8 @@ article.page {
padding: 20px 0; } padding: 20px 0; }
.landing-page-title-head h1 { .landing-page-title-head h1 {
color: #ffffff; color: #ffffff;
padding-left: 15px; } padding-left: 15px;
font-family: 'BuckeyeSerifSemiBold'; }
.landing-page-title-head a { .landing-page-title-head a {
color: #ffffff; } color: #ffffff; }
.landing-page-title-head .active { .landing-page-title-head .active {
......
source diff could not be displayed: it is too large. Options to address this: view the blob.
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
#} #}
<div class="footer-address"> <div class="footer-address">
<p class="contact-heading"><a href="/contact">Contact Us</a></p> <p class="contact-heading"><a href="/contact">{{ site_name }}</a></p>
<p> <p>
{% if content.field_address_line1.0 %} {% if content.field_address_line1.0 %}
{{ content.field_address_line1.0 }}<br/> {{ content.field_address_line1.0 }}<br/>
......
...@@ -4,7 +4,11 @@ ...@@ -4,7 +4,11 @@
<div id="footer1-container" class="col-xs-12 col-md-4"> <div id="footer1-container" class="col-xs-12 col-md-4">
<a href="https://osu.edu/"> <a href="https://osu.edu/">
<img src="{{ base_path ~ directory }}/images/logos/asc-logo-white.svg" id="footer-osu-logo" alt="The Ohio State University College of Arts and Sciences logo" /> {% if osu_logo %}
<img src="{{ base_path ~ directory }}/images/osu-logos/horiz/osu-horiz-white.svg" id="footer-osu-logo" alt="The Ohio State University logo" />
{% else %}
<img src="{{ base_path ~ directory }}/images/logos/asc-logo-white.svg" id="footer-osu-logo" alt="The Ohio State University College of Arts and Sciences logo" />
{% endif %}
</a> </a>
{% if page.footer_one %} {% if page.footer_one %}
{% block footer_one %} {% block footer_one %}
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<div class="container"> <div class="container">
<div id="header-logos"> <div id="header-logos">
<div class="parent-name"> <div class="parent-name">
{% if site_name != 'College of Arts and Sciences' %} {% if site_name != 'College of Arts and Sciences' and not osu_logo %}
<a href="https://www.asc.osu.edu" class="dep-logo"> <a href="https://www.asc.osu.edu" class="dep-logo">
College of Arts and Sciences College of Arts and Sciences
</a> </a>
......
...@@ -92,6 +92,10 @@ ...@@ -92,6 +92,10 @@
</p> </p>
{% endif %} {% endif %}
{% if content.field_twitter.0 != '' or content.field_youtube.0 != '' or content.field_linkedin.0 != '' %}
<div class="profile-social">
{% endif %}
{% if content.field_twitter.0 != '' %} {% if content.field_twitter.0 != '' %}
<a href="https://twitter.com/{{ content.field_twitter.0 }}" title="{{ content.field_first_name.0 }} {{ content.field_last_name.0 }}'s Twitter"> <a href="https://twitter.com/{{ content.field_twitter.0 }}" title="{{ content.field_first_name.0 }} {{ content.field_last_name.0 }}'s Twitter">
<img src="/themes/asc_bootstrap/images/social-media/twitter.svg" alt="Twitter logo"> <img src="/themes/asc_bootstrap/images/social-media/twitter.svg" alt="Twitter logo">
...@@ -110,6 +114,10 @@ ...@@ -110,6 +114,10 @@
</a> </a>
{% endif %} {% endif %}
{% if content.field_twitter.0 != '' or content.field_youtube.0 != '' or content.field_linkedin.0 != '' %}
</div>
{% endif %}
{% if content.field_office_hours.0 != '' %} {% if content.field_office_hours.0 != '' %}
<h3>Office Hours</h3> <h3>Office Hours</h3>
<p> <p>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
function asc_bootstrap_bux_form_system_theme_settings_alter(&$form, Drupal\Core\Form\FormStateInterface $form_state) { function asc_bootstrap_bux_form_system_theme_settings_alter(&$form, Drupal\Core\Form\FormStateInterface $form_state) {
$form['asc_bootstrap_bux_settings']['osu_logo'] = array( $form['asc_bootstrap_bux_settings']['osu_logo'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Use OSU Logo in site header'), '#title' => t('Not a part of the College Arts and Sciences'),
'#default_value' => theme_get_setting('osu_logo', 'asc_bootstrap_bux'), '#default_value' => theme_get_setting('osu_logo', 'asc_bootstrap_bux'),
); );
} }