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.

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

add secondaryFont sans-serif #695

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 sass/_archives.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
a {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down
4 changes: 2 additions & 2 deletions sass/_event.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ a.event-card {
color: $darkgray;

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

border-bottom: 1px solid $lightgray;
Expand All @@ -31,7 +31,7 @@ a.event-card {
.date {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down
4 changes: 2 additions & 2 deletions sass/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body {
body {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}
}

Expand Down Expand Up @@ -160,7 +160,7 @@ button.filter,
a.eventlist {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down
4 changes: 2 additions & 2 deletions sass/_themes.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$themes: (
default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans"),
contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans")
default: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans", "secondaryFont": sans-serif),
contrast: ("headingFont": "GrueneType", "headingFontBold": "GrueneType", "standardFont": "PTSans", "secondaryFont": sans-serif)
);

@mixin themed() {
Expand Down
8 changes: 4 additions & 4 deletions sass/_typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ h3,
.has-medium-font-size {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand All @@ -89,7 +89,7 @@ h4,
.h4 {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand All @@ -100,7 +100,7 @@ h5,
.h5 {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand All @@ -111,7 +111,7 @@ h6,
.h6 {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down
4 changes: 2 additions & 2 deletions sass/_widgets.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
&-title {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down Expand Up @@ -69,7 +69,7 @@
&.wp-block-search__label {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down
2 changes: 1 addition & 1 deletion sass/wp-blocks/button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
border-radius: 3px;

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

&:hover {
Expand Down
2 changes: 1 addition & 1 deletion sass/wp-blocks/rss.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
&-title {

@include themed() {
font-family: t("standardFont");
font-family: t("standardFont"), t(secondaryFont);
}

font-weight: 700;
Expand Down