Skip to content

Commit 737a197

Browse files
Merge pull request #944 from carrythebanner/font-size
Up base font size; use scalable font units
2 parents e9cfcef + 1757274 commit 737a197

File tree

7 files changed

+50
-10
lines changed

7 files changed

+50
-10
lines changed

cal/src/style.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ html {
7070
}
7171
body {
7272
font-family: roboto, Helvetica, Arial, sans-serif;
73-
font-size: 14px;
73+
font-size: 1rem;
7474
line-height: 1.42857143;
7575
color: var(--page-text);
7676
background-color: var(--page-bg);

cal/src/tools/SearchTool.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default {
6565
gap: 0.5em;
6666
}
6767
.c-search__past {
68-
font-size: 14px;
68+
font-size: 1rem;
6969
align-self: center;
7070
white-space: pre;
7171
}

cal/src/tools/ToolButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ export default {
7979
display: flex;
8080
justify-content: center;
8181
gap: 0.5em;
82-
font-size: 16px;
82+
font-size: 1rem;
8383
}*/
8484
</style>

cal/src/tools/ToolPanel.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ export default {
3737
display: flex;
3838
justify-content: center;
3939
gap: 0.5em;
40-
font-size: 16px;
40+
font-size: 1rem;
4141
}
4242
</style>

site/themes/s2b_hugo_theme/assets/css/cal/main.css

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ But if someone is using a high contrast display mode, the border will appear.
6464
}
6565

6666
svg.icon {
67-
width: 22px;
68-
height: 22px;
67+
width: 1.375rem;
68+
height: 1.375rem;
6969
margin-right: 4px;
7070
vertical-align: middle;
7171
fill: currentColor;
@@ -138,7 +138,7 @@ svg.icon {
138138
width: 100%;
139139
text-align: left;
140140
padding: 0;
141-
font-size: 1.75rem;
141+
font-size: 1.1rem;
142142
font-weight: 500;
143143
}
144144

@@ -337,6 +337,7 @@ h3 {
337337
.btn {
338338
color: #37b;
339339
background: #efefef;
340+
font-size: 0.8125rem;
340341
}
341342

342343
.btn:focus {
@@ -402,7 +403,7 @@ button.expand-details {
402403
.pp-banner .pp-headline,
403404
.promo-banner .pp-headline {
404405
font-weight: bold;
405-
font-size: 24px;
406+
font-size: 1.5rem;
406407
color: #663300;
407408
}
408409

site/themes/s2b_hugo_theme/assets/css/custom.css

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,24 @@
88
--carousel-bg-img: url('../img/S2B_photo_grid_2094x796.jpg') center center repeat;
99
}
1010

11+
html,
12+
body {
13+
font-size: 1rem;
14+
}
15+
16+
h1,
17+
#heading-breadcrumbs h1 {
18+
font-size: 2rem;
19+
}
20+
21+
h2 {
22+
font-size: 1.875rem;
23+
}
24+
25+
h3 {
26+
font-size: 1.5rem;
27+
}
28+
1129
.box-image-text .image {
1230
min-height: 200px;
1331
max-height: 200px;
@@ -62,9 +80,30 @@ header {
6280
}
6381

6482
.navbar ul.dropdown-menu li a {
83+
font-size: 0.75rem;
6584
color: #555555;
6685
}
6786

87+
.navbar-nav .open .dropdown-menu > li > a {
88+
line-height: 1.25;
89+
}
90+
91+
.caret {
92+
/* override Bootstrap caret styles */
93+
border: 0;
94+
width: auto;
95+
height: auto;
96+
}
97+
98+
.dropdown-toggle .caret::after {
99+
content: "▾" / ""
100+
}
101+
102+
.dropdown-toggle[aria-expanded="true"] .caret {
103+
transform: rotate(180deg);
104+
}
105+
106+
68107
.header-dark-mask {
69108
background: var(--primary-accent);
70109
opacity: 0.8;
@@ -93,7 +132,7 @@ main .donate a {
93132
color: #630;
94133
border-radius: 12px;
95134
padding: 0.25em 1em;
96-
font-size: 16px;
135+
font-size: 1rem;
97136
}
98137

99138
.affix {

site/themes/s2b_hugo_theme/layouts/partials/nav.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
{{ range .Site.Menus.main }}
2626
<li class="dropdown">
2727
{{ if .HasChildren }}
28-
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }} <span class="caret"></span></a>
28+
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ .Name }} <span class="caret" role="img" aria-hidden="true"></span></a>
2929
<ul class="dropdown-menu">
3030
{{ range .Children }}
3131
<li>

0 commit comments

Comments
 (0)