Skip to content

Commit

Permalink
Merge pull request #116 from carpentries/fix-font-sizes
Browse files Browse the repository at this point in the history
[bug fix] use rem units for callouts
  • Loading branch information
zkamvar authored Dec 14, 2023
2 parents 3e7db76 + 7b83b84 commit 3079f59
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 12 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: varnish
Title: Front-end for The Carpentries Lesson Template
Version: 1.0.0
Version: 1.0.1
Authors@R: c(
person(given = "Zhian N.",
family = "Kamvar",
Expand Down
9 changes: 9 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# varnish 1.0.1 (2023-12-14)

## BUG FIX

* Font sizes for headings of overview box, callouts, and accordions now use
relative units instead of pixels. This will cause a slight change in the
appearance of these headings, but they will be more consistent as the size of
the window changes.

# varnish 1.0.0 (2023-12-13)

## MAJOR VERSION NOTE
Expand Down
2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css.map

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions source/stylesheets/callouts.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

.callout-title {
position: relative;
font-size: 18px;
line-height: 24px;
font-size: 1.25rem;
line-height: 1.75rem;
text-transform: uppercase;
letter-spacing: 0.1em;
margin: 0px 0px 25px 0px;
Expand All @@ -41,8 +41,8 @@

.callout li {
margin-left: 0px;
margin-top:10px;
margin-bottom:20px;
margin-top: 10px;
margin-bottom: 20px;
}

.callout-inner {
Expand Down Expand Up @@ -141,7 +141,7 @@
font-family: Mulish;
font-style: normal;
font-weight: normal;
font-size: 16px;
font-size: 1.2rem;
&:first-of-type .accordion-button {
border-radius: 0;
}
Expand All @@ -154,7 +154,7 @@
font-family: Mulish;
font-style: normal;
font-weight: normal;
font-size: 16px;
font-size: 1.2rem;
}
.accordion-body {
padding-left: 35px;
Expand Down Expand Up @@ -198,7 +198,7 @@
}
&, h3 {
font-family: Mulish;
font-size: 16px;
font-size: 1.2rem;
font-style: normal;
font-weight: normal;
text-transform: uppercase;
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/overview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
border: none;
height: 53px;
padding-top: 7px;
font-size: calc(18px + 0.3vw);
font-size: min(1.5rem, calc(1.25rem + 0.2vw));
letter-spacing: 0.1em;
font-weight: 400;
}
Expand Down Expand Up @@ -39,7 +39,7 @@
text-decoration-thickness: 1px;
text-underline-offset: 25px;
margin-bottom: 50px;
font-size: min(25px, calc(22px + 0.2vw));
font-size: min(1.5rem, calc(1.25rem + 0.25vw));
font-weight: 600;
line-height: 1.5rem;
}
Expand Down

0 comments on commit 3079f59

Please sign in to comment.