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

Use a Sass variable for default font #151

Merged
merged 4 commits into from
Oct 30, 2024
Merged

Use a Sass variable for default font #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cdbb14b
Use variable for default font
Bisaloo Oct 23, 2024
d562d6d
Render & minimize css
Bisaloo Oct 23, 2024
6422a23
Add NEWS item
Bisaloo Oct 30, 2024
ff079ae
Merge branch 'main' into font-variable
froggleston Oct 30, 2024
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
17 changes: 17 additions & 0 deletions NEWS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,24 @@
# varnish 1.0.5.9000 ()

## NEW FEATURES

* Two new Sass variables (`default_font` and `mono_font`) have been created to
simplify the process of changing the default font and monospace font.
In particular, this can be helpful for forks defining their own theme
(@Bisaloo #151)
* Carpentry-specific favicons are now used automatically based on the value of
the `carpentry:` value in the `config.yaml` file (@Bisaloo, #152, based on a
report from @zkamvar in #33).


# varnish 1.0.4 (2024-08-23)

## NEW FEATURES

* Two new Sass variables (`default_font` and `mono_font`) have been created to
simplify the process of changing the default font and monospace font.
In particular, this can be helpful for forks defining their own theme
(@Bisaloo #151)
* Carpentry-specific favicons are now used automatically based on the value of
the `carpentry:` value in the `config.yaml` file (@Bisaloo, #152, based on a
report from @zkamvar in #33).
Expand Down
2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/pkgdown/assets/assets/styles.css.map
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions source/stylesheets/callouts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
}
.accordion-item {
border-color: $black;
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: normal;
font-size: 1.2rem;
Expand All @@ -151,7 +151,7 @@
}
}
.accordion-header {
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: normal;
font-size: 1.2rem;
Expand Down Expand Up @@ -197,7 +197,7 @@
box-shadow: #0d6efd 0px 0px 0px 4px;
}
&, h3 {
font-family: Mulish;
font-family: $default_font;
font-size: 1.2rem;
font-style: normal;
font-weight: normal;
Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/codeblocks.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ div.sourceCode {
/* ZNK: added in 2022-01-07 */

pre {
font-family: 'Source Code Pro', monospace;
font-family: $mono_font, monospace;
font-style: normal;
font-weight: normal;
font-size: 16px;
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/footer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.footer {
margin-top: 25px;
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: 300;
font-size: 14px;
Expand All @@ -11,4 +11,4 @@

.footer p{
padding-left: 20px;
}
}
8 changes: 4 additions & 4 deletions source/stylesheets/header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}

.mobile-title {
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: 800;
font-size: 24px;
Expand Down Expand Up @@ -167,7 +167,7 @@
}

.lesson-title {
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: 800;
font-size: 24px;
Expand Down Expand Up @@ -359,7 +359,7 @@

.lesson-title-md {
display: block;
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: 800;
font-size: 32px;
Expand Down Expand Up @@ -462,7 +462,7 @@

.lesson-title-md {
display: inline-block;
font-family: Mulish;
font-family: $default_font;
font-style: normal;
font-weight: 800;
font-size: 32px;
Expand Down
4 changes: 2 additions & 2 deletions source/stylesheets/instructornotes.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
padding: 25px 35px;
background: $light-gray;
li {
list-style-type: inherit;
list-style-type: inherit;
margin-left: 0px;
margin-top:10px;
margin-bottom:20px;
Expand All @@ -31,7 +31,7 @@
box-shadow: #0d6efd 0px 0px 0px 4px;
}
&, h3 {
font-family: Mulish;
font-family: $default_font;
font-size: 16px;
font-style: normal;
font-weight: normal;
Expand Down
2 changes: 1 addition & 1 deletion source/stylesheets/styles.css.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
}

body {
font-family: 'Mulish', sans serif;
font-family: $default_font, sans serif;
font-weight: $font_weight_normal;
}

Expand Down
2 changes: 2 additions & 0 deletions source/stylesheets/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
$font_weight_normal: 400;
$font_weight_bold: 800;
$default_font: Mulish;
$mono_font: 'Source Code Pro';
$asset_base_path: '../assets' !default;

$black: #383838;
Expand Down