Skip to content
Snippets Groups Projects
Commit 26594216 authored by Chris Shantz's avatar Chris Shantz
Browse files

Merge branch '3.1.x' into prod/3.1.x

parents 47dc0016 0bc2cdec
No related branches found
No related tags found
No related merge requests found
......@@ -6,3 +6,4 @@ gesso/
css/
js/
source/_patterns/00-config/_design-tokens.artifact.scss
source/_data/design-tokens.artifact.yml
......@@ -30,6 +30,7 @@
<div class="uw-header__site-name">
{% include '@components/site-name/site-name.twig' with {
'site_name': site_name,
'subtitle': subtitle,
'home_link': home_link
} %}
</div>
......
......@@ -580,6 +580,12 @@ are the same height. */
font-size:rem(gesso-font-size(-1));
line-height: 1.2;
}
em, i {
font-style: normal;
}
strong, b {
font-weight: bold;
}
}
}
&--no-carousel{
......
......@@ -16,6 +16,12 @@
<div class="uw-ff--text uw-ff--text__{{ detail.type }}">
<img src="{{ detail.icon }}" />
</div>
{% elseif detail.type == 'caption' %}
{% if detail.caption %}
<span class="uw-ff--text uw-ff--text__caption">
{{ detail.caption }}
</span>
{% endif %}
{% else %}
<span class="uw-ff--text uw-ff--text__{{ detail.type }}">{{ detail.text }}</span>
{% endif %}
......@@ -38,6 +44,12 @@
<div class="uw-ff--text uw-ff--text__{{ detail.type }}">
<img src="{{ detail.icon }}" />
</div>
{% elseif detail.type == 'caption' %}
{% if detail.caption %}
<span class="uw-ff--text uw-ff--text__caption">
{{ detail.caption }}
</span>
{% endif %}
{% else %}
<span class="uw-ff--text uw-ff--text__{{ detail.type }}">{{ detail.text }}</span>
{% endif %}
......
......@@ -19,6 +19,9 @@ ffs:
-
text: 'Small #1'
type: 'small'
-
caption: '<p>This <strong>would be</strong> caption</p>'
type: 'caption'
-
- type: 'infographics'
infographics:
......@@ -65,3 +68,6 @@ ffs:
-
text: 'Small #1'
type: 'small'
-
caption: '<p>This would be caption</p>'
type: 'caption'
......@@ -3,7 +3,7 @@
$site-name-font-family: gesso-grayscale(gray-2);
$site-name-font-size: gesso-font-size(5);
$site-slogan-font-size: gesso-font-size(2);
.uw-site-name {
a{
&:hover{ text-decoration:underline;}
......@@ -29,6 +29,17 @@ $site-name-font-size: gesso-font-size(5);
font-size:$site-name-font-size;
margin:0;
padding:0.5rem 0;
}
&__subtitle {
display:block;
font-family: gesso-font-family(condensedbook);
font-size: gesso-font-size(0);
@include medium{
font-size: $site-slogan-font-size;
}
margin: 0;
padding:0 0 0.5rem;
}
}
......@@ -2,6 +2,13 @@
<div class="uw-site-name__wrapper">
<a class="uw-site-name__link" href="{{ home_link }}" title="{{ site_name}} {{ 'Home'|t }}" rel="home">
<h1 class="uw-site-name__text">{{ site_name }}</h1>
{% if subtitle %}
{% include '@components/site-slogan/site-slogan.twig' with {
'subtitle': subtitle,
} %}
{% endif %}
</a>
</div>
</div>
......
<span class="site-slogan">{{ site_slogan }}</span>
<h2 class="uw-site-name__subtitle">{{ subtitle }}</h2>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment