Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds a theme setting for heading font #578

Merged
merged 3 commits into from
Dec 6, 2023
Merged

Adds a theme setting for heading font #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d6545e
CuBoulder/tiamat-theme#516 adds heading font setting
timurtripp Dec 5, 2023
7c8da8e
CuBoulder/tiamat-theme#516 fixes inconsistent Article List heading; c…
timurtripp Dec 5, 2023
8872fd6
CuBoulder/tiamat-theme#551 changes secondary menu default position to…
timurtripp Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion boulder_base.theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ function boulder_base_preprocess_page(array &$variables) {
$variables['ucb_social_share_position'] = theme_get_setting('ucb_social_share_position');
$variables['ucb_rave_alerts'] = theme_get_setting('ucb_rave_alerts');
$variables['ucb_sticky_menu'] = theme_get_setting('ucb_sticky_menu');
$variables['ucb_date_format'] = theme_get_setting('ucb_date_format');
$variables['ucb_heading_font'] = theme_get_setting('ucb_heading_font');
$useCustomLogo = theme_get_setting('ucb_use_custom_logo');
if ($useCustomLogo) {
$logoDarkURL = file_create_url(theme_get_setting('ucb_custom_logo_dark_path'));
Expand Down
3 changes: 2 additions & 1 deletion config/install/boulder_base.settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ ucb_be_boulder: '1'
ucb_rave_alerts: 1
ucb_sticky_menu: 0
ucb_secondary_menu_default_links: 0
ucb_secondary_menu_position: inline
ucb_secondary_menu_position: above
ucb_secondary_menu_button_display: 0
ucb_footer_menu_default_links: 0
ucb_social_share_position: '0'
ucb_breadcrumb_nav: 1
ucb_use_custom_logo: false
ucb_heading_font: 'bold'
112 changes: 56 additions & 56 deletions css/block/ucb-article-list-block.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
.ucb-article-list-block-button-container{
text-align: right;
.ucb-article-list-block-button-container {
text-align: right;
}

.ucb-article-list-block-button{
font-weight: normal;
margin: 0;
.ucb-article-list-block-button {
font-weight: normal;
margin: 0;
}

/* .ucb-article-list-block-button:hover{
transition: background-color 0.25s ease, border-color 0.25s ease, color 0.25s ease;
background-color: #0277BD;
color: white !important;
transition: background-color 0.25s ease, border-color 0.25s ease, color 0.25s ease;
background-color: #0277BD;
color: white !important;
} */

.ucb-article-card{
margin-bottom: 20px;
border-bottom: solid 1px rgba(128, 128, 128, 0.333);
padding-bottom: 20px;
.ucb-article-card {
margin-bottom: 20px;
border-bottom: solid 1px rgba(128, 128, 128, 0.333);
padding-bottom: 20px;
}

.ucb-article-card-title-only{
padding-bottom: 20px;
.ucb-article-card-title-only {
padding-bottom: 20px;
}

.ucb-article-card-img{
width: 100px;
height: 100px;
padding: 0px;
.ucb-article-card-img {
width: 100px;
height: 100px;
padding: 0px;
}

.ucb-article-card-img.title-thumbnail-img{
width: 65px;
height: 65px;
padding: 0px;
.ucb-article-card-img.title-thumbnail-img {
width: 65px;
height: 65px;
padding: 0px;
}

.ucb-article-card-img-wide{
height: 500px !important;
object-fit: cover !important;
margin-bottom: 20px;
width: 100%;
.ucb-article-card-img-wide {
height: 500px !important;
object-fit: cover !important;
margin-bottom: 20px;
width: 100%;
}

.ucb-article-card-img-full{
width: 100% !important;
margin-bottom: 20px;
.ucb-article-card-img-full {
width: 100% !important;
margin-bottom: 20px;

}

.ucb-article-card-date {
font-size: 85%;
line-height: 85%;
margin-bottom: 10px;
font-size: 85%;
line-height: 85%;
margin-bottom: 10px;
}

.ucb-article-card-read-more{
text-transform: uppercase;
font-weight: 600;
font-size: 75%;
.ucb-article-card-read-more {
text-transform: uppercase;
font-weight: 600;
font-size: 75%;
}

.ucb-article-card-summary{
margin-bottom: 0px;
.ucb-article-card-summary {
margin-bottom: 0px;
}

.ucb-article-card-title{
font-size: 120%;
font-weight: normal;
margin: 0;
line-height: 1.3;
.ucb-article-card-title {
font-size: 120%;
font-weight: normal;
margin: 0;
line-height: 1.3;
}

@media only screen and (max-width: 600px) {
.ucb-article-card-img{
width: 50px;
height: 50px;
padding: 0px;
}
.ucb-article-card-img.title-thumbnail-img{
width: 50px;
height: 50px;
padding: 0px;
}
}
.ucb-article-card-img {
width: 50px;
height: 50px;
padding: 0px;
}

.ucb-article-card-img.title-thumbnail-img {
width: 50px;
height: 50px;
padding: 0px;
}
}
15 changes: 15 additions & 0 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,3 +912,18 @@ div.table-vertical table td {
border-top: none;
border-bottom: none;
}

.ucb-heading-font-normal h1,
.ucb-heading-font-normal h2,
.ucb-heading-font-normal h3,
.ucb-heading-font-normal h4,
.ucb-heading-font-normal h5,
.ucb-heading-font-normal h6,
.ucb-heading-font-normal .h1,
.ucb-heading-font-normal .h2,
.ucb-heading-font-normal .h3,
.ucb-heading-font-normal .h4,
.ucb-heading-font-normal .h5,
.ucb-heading-font-normal .h6 {
font-weight: 400;
}
91 changes: 45 additions & 46 deletions css/ucb-article-list.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,84 +1,83 @@
#ucb-article-listing {
margin-bottom: 20px;
margin-bottom: 20px;
}

.ucb-article-list-header {
font-weight: normal;
font-size: 220%;
font-size: 220%;
}

.ucb-list-msg {
font-size: 1.25em;
font-weight: bolder;
text-align: center;
display: none;
font-size: 1.25em;
font-weight: bolder;
text-align: center;
display: none;
}

.ucb-loading-data {
color: #01579b;
color: #01579b;
}

.ucb-article-card-container {
border-bottom: 2px solid rgba(128, 128, 128, 0.333);
margin-bottom: 20px;
border-bottom: 2px solid rgba(128, 128, 128, 0.333);
margin-bottom: 20px;
}

.ucb-article-card-data {
display: flex;
flex-direction: column;
margin-bottom: 20px;
display: flex;
flex-direction: column;
margin-bottom: 20px;
}

.ucb-article-card-title {
font-size: 120%;
font-weight: normal;
margin-bottom: 10px;
line-height: 1.3;
margin: 0 0 10px 0;
font-size: 120%;
font-weight: normal;
margin-bottom: 10px;
line-height: 1.3;
margin: 0 0 10px 0;
}

.ucb-article-card-date {
font-size: 85%;
line-height: 85%;
margin-bottom: 10px;
font-size: 85%;
line-height: 85%;
margin-bottom: 10px;
}

.ucb-article-card-body {
margin-bottom: 0;
margin-bottom: 0;
}

.ucb-article-card-img {
width: calc(100px + var(--bs-gutter-x));
height: auto;
margin-bottom: 20px;
width: calc(100px + var(--bs-gutter-x));
height: auto;
margin-bottom: 20px;
}

.ucb-article-card-more {
text-transform: uppercase;
font-weight: 600;
font-size: 75%;
text-transform: uppercase;
font-weight: 600;
font-size: 75%;
}

.ucb-article-list-button-container{
text-align: center;
.ucb-article-list-button-container {
text-align: center;
}

.ucb-article-list-button{
display: none;
padding: 5px 10px;
font-weight: bold;
font-family: "Roboto","Helvetica Neue",Helvetica,Arial,sans-serif;
margin-bottom: 5px;
background-clip: padding-box;
color: #0277BD !important;
border: 1px solid #0277BD;
border-radius: 0px;
background-color: transparent;
text-decoration: none;
.ucb-article-list-button {
display: none;
padding: 5px 10px;
font-weight: bold;
font-family: "Roboto", "Helvetica Neue", Helvetica, Arial, sans-serif;
margin-bottom: 5px;
background-clip: padding-box;
color: #0277BD !important;
border: 1px solid #0277BD;
border-radius: 0px;
background-color: transparent;
text-decoration: none;
}

.ucb-article-list-button:hover{
transition: background-color 0.25s ease, border-color 0.25s ease, color 0.25s ease;
background-color: #0277BD;
color: white !important;
.ucb-article-list-button:hover {
transition: background-color 0.25s ease, border-color 0.25s ease, color 0.25s ease;
background-color: #0277BD;
color: white !important;
}
2 changes: 1 addition & 1 deletion templates/layout/page--search.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

<div class="layout-container ucb-page-container">
{{ block("page_header", "page.html.twig") }}
<div class="ucb-page-content">
<div class="ucb-page-content{% if ucb_heading_font == 'normal' %} ucb-heading-font-normal{% endif %}">
{{ page.highlighted }}
{{ page.help }}
<main role="main">
Expand Down
34 changes: 17 additions & 17 deletions templates/layout/page--user--login.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,21 +48,21 @@


<div class="layout-container ucb-page-container">
{{ block("page_header", "page.html.twig") }}
<div class="ucb-page-content">
{{ page.highlighted }}
{{ page.help }}
<main role="main">
<a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
<div class="ucb-above-content-region container">
{{ page.above_content }}
</div>
<div class="layout-content container">
<div class="ucb-user-login-container">
{{ page.content }}
</div>
</div>{# /.layout-content #}
</main>
</div>
{{ block("page_footer", "page.html.twig") }}
{{ block("page_header", "page.html.twig") }}
<div class="ucb-page-content{% if ucb_heading_font == 'normal' %} ucb-heading-font-normal{% endif %}">
{{ page.highlighted }}
{{ page.help }}
<main role="main">
<a id="main-content" tabindex="-1"></a>{# link is in html.html.twig #}
<div class="ucb-above-content-region container">
{{ page.above_content }}
</div>
<div class="layout-content container">
<div class="ucb-user-login-container">
{{ page.content }}
</div>
</div>{# /.layout-content #}
</main>
</div>
{{ block("page_footer", "page.html.twig") }}
</div>{# /.layout-container #}
Loading