Skip to content

Update font-family variables. #807

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

Merged
mbklein merged 1 commit into from
Feb 26, 2025
Merged

Update font-family variables. #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
519 changes: 265 additions & 254 deletions app/assets/stylesheets/nuwebcomm/base/_core.scss
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 29 additions & 29 deletions app/assets/stylesheets/nuwebcomm/base/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

// headers
h2 {
font: 46px/1.2em $CamptonExtraLight;
font: 46px/1.2em $PoppinsExtraLight;
color: $nu-purple;
margin-bottom: 1rem;
}

h3 {
font: 30px/1.2em $CamptonBold;
font: 30px/1.2em $PoppinsBold;
color: $nu-purple;
margin-bottom: 0.5rem;

&.demo {
// used only for boilerplate.html (not for production!)
font: 26px/1.2em $CamptonBold;
font: 26px/1.2em $PoppinsBold;
background: $nu-purple-120;
color: $white;
padding: 1rem;
Expand All @@ -35,7 +35,7 @@ h5 {
}

h6 {
font: 18px/1.3em $CamptonBold;
font: 18px/1.3em $PoppinsBold;
color: $rich-black-50;
margin-bottom: 0.5rem;
}
Expand Down Expand Up @@ -125,7 +125,7 @@ h6 {

> li {
list-style: none;
background: url('#{$path-images}/icons/bullet.png') 0 0.6em no-repeat;
background: url("#{$path-images}/icons/bullet.png") 0 0.6em no-repeat;
padding: 0 0 0.5em 1.5em;

&:last-child {
Expand Down Expand Up @@ -361,71 +361,71 @@ h6 {

// web fonts
@font-face {
font-family: 'Akkurat Pro Light';
src: url('#{$path-fonts}/AkkuratProLight.woff') format('woff');
font-family: "Akkurat Pro Light";
src: url("#{$path-fonts}/AkkuratProLight.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Light Italic';
src: url('#{$path-fonts}/AkkuratProLightItalic.woff') format('woff');
font-family: "Akkurat Pro Light Italic";
src: url("#{$path-fonts}/AkkuratProLightItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Regular';
src: url('#{$path-fonts}/AkkuratProRegular.woff') format('woff');
font-family: "Akkurat Pro Regular";
src: url("#{$path-fonts}/AkkuratProRegular.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Italic';
src: url('#{$path-fonts}/AkkuratProItalic.woff') format('woff');
font-family: "Akkurat Pro Italic";
src: url("#{$path-fonts}/AkkuratProItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Bold';
src: url('#{$path-fonts}/AkkuratProBold.woff') format('woff');
font-family: "Akkurat Pro Bold";
src: url("#{$path-fonts}/AkkuratProBold.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Bold Italic';
src: url('#{$path-fonts}/AkkuratProBoldItalic.woff') format('woff');
font-family: "Akkurat Pro Bold Italic";
src: url("#{$path-fonts}/AkkuratProBoldItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Campton Book';
src: url('#{$path-fonts}/CamptonBook.woff') format('woff');
font-weight: normal;
font-family: "Poppins Light";
src: url("#{$path-fonts}/Poppins-Light.woff") format("woff");
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Campton Bold';
src: url('#{$path-fonts}/CamptonBold.woff') format('woff');
font-weight: normal;
font-family: "Poppins Bold";
src: url("#{$path-fonts}/Poppins-Bold.woff") format("woff");
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Campton Extra Bold';
src: url('#{$path-fonts}/CamptonExtraBold.woff') format('woff');
font-weight: normal;
font-family: "Poppins Extra Bold";
src: url("#{$path-fonts}/Poppins-ExtraBold.woff") format("woff");
font-weight: 800;
font-style: normal;
}

@font-face {
font-family: 'Campton Extra Light';
src: url('#{$path-fonts}/CamptonExtraLight.woff') format('woff');
font-weight: normal;
font-family: "Poppins Extra Light";
src: url("#{$path-fonts}/Poppins-ExtraLight.woff") format("woff");
font-weight: 100;
font-style: normal;
}
8 changes: 4 additions & 4 deletions app/assets/stylesheets/nuwebcomm/base/_variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ $AkkuratProRegular: "Akkurat Pro Regular", Arial, sans-serif;
$AkkuratProItalic: "Akkurat Pro Italic", Arial, sans-serif;
$AkkuratProBold: "Akkurat Pro Bold", "Arial Black", sans-serif;
$AkkuratProBoldItalic: "Akkurat Pro Bold Italic", "Arial Black", sans-serif;
$CamptonBook: "Campton Book", Tahoma, sans-serif;
$CamptonBold: "Campton Bold", Impact, sans-serif;
$CamptonExtraBold: "Campton Extra Bold", Impact, sans-serif;
$CamptonExtraLight: "Campton Extra Light", "Courier New", sans-serif;
$PoppinsLight: "Poppins Light", Tahoma, sans-serif;
$PoppinsBold: "Poppins Bold", Impact, sans-serif;
$PoppinsExtraBold: "Poppins Extra Bold", Impact, sans-serif;
$PoppinsExtraLight: "Poppins Extra Light", "Courier New", sans-serif;
56 changes: 28 additions & 28 deletions app/assets/stylesheets/nuwebcomm/overrides/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@

// headers
h2 {
font: 46px/1.2em $CamptonExtraLight;
font: 46px/1.2em $PoppinsExtraLight;
color: $nu-purple;
margin-bottom: 1rem;
}

h3 {
font: 30px/1.2em $CamptonBold;
font: 30px/1.2em $PoppinsBold;
color: $nu-purple;
margin-bottom: 0.5rem;

&.demo {
// used only for boilerplate.html (not for production!)
font: 26px/1.2em $CamptonBold;
font: 26px/1.2em $PoppinsBold;
background: $nu-purple-120;
color: $white;
padding: 1rem;
Expand All @@ -35,7 +35,7 @@ h5 {
}

h6 {
font: 18px/1.3em $CamptonBold;
font: 18px/1.3em $PoppinsBold;
color: $rich-black-50;
margin-bottom: 0.5rem;
}
Expand Down Expand Up @@ -365,71 +365,71 @@ h6 {

// web fonts
@font-face {
font-family: 'Akkurat Pro Light';
src: url('#{$path-fonts}/AkkuratProLight.woff') format('woff');
font-family: "Akkurat Pro Light";
src: url("#{$path-fonts}/AkkuratProLight.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Light Italic';
src: url('#{$path-fonts}/AkkuratProLightItalic.woff') format('woff');
font-family: "Akkurat Pro Light Italic";
src: url("#{$path-fonts}/AkkuratProLightItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Regular';
src: url('#{$path-fonts}/AkkuratProRegular.woff') format('woff');
font-family: "Akkurat Pro Regular";
src: url("#{$path-fonts}/AkkuratProRegular.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Italic';
src: url('#{$path-fonts}/AkkuratProItalic.woff') format('woff');
font-family: "Akkurat Pro Italic";
src: url("#{$path-fonts}/AkkuratProItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Bold';
src: url('#{$path-fonts}/AkkuratProBold.woff') format('woff');
font-family: "Akkurat Pro Bold";
src: url("#{$path-fonts}/AkkuratProBold.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Akkurat Pro Bold Italic';
src: url('#{$path-fonts}/AkkuratProBoldItalic.woff') format('woff');
font-family: "Akkurat Pro Bold Italic";
src: url("#{$path-fonts}/AkkuratProBoldItalic.woff") format("woff");
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Campton Book';
src: url('#{$path-fonts}/CamptonBook.woff') format('woff');
font-weight: normal;
font-family: "Poppins Light";
src: url("#{$path-fonts}/Poppins-Light.woff") format("woff");
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Campton Bold';
src: url('#{$path-fonts}/CamptonBold.woff') format('woff');
font-weight: normal;
font-family: "Poppins Bold";
src: url("#{$path-fonts}/Poppins-Bold.woff") format("woff");
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Campton Extra Bold';
src: url('#{$path-fonts}/CamptonExtraBold.woff') format('woff');
font-weight: normal;
font-family: "Poppins Extra Bold";
src: url("#{$path-fonts}/Poppins-ExtraBold.woff") format("woff");
font-weight: 800;
font-style: normal;
}

@font-face {
font-family: 'Campton Extra Light';
src: url('#{$path-fonts}/CamptonExtraLight.woff') format('woff');
font-weight: normal;
font-family: "Poppins Extra Light";
src: url("#{$path-fonts}/Poppins-ExtraLight.woff") format("woff");
font-weight: 100;
font-style: normal;
}
Loading
Loading