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

[assets] font weights as variables #1054

Merged
merged 7 commits into from
May 12, 2020
Merged
Show file tree
Hide file tree
Changes from 5 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
4 changes: 2 additions & 2 deletions assets/scss/00-base/_pikaday.scss
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
background-color: $c-bg-section;
color: $c-font-base;
font-size: 13px;
font-weight: 500;
font-weight: $fonts-normal;
text-align: center;

.is-today & {
color: $c-primary;
font-weight: 800;
font-weight: $fonts-bolder;

&:hover {
color: $c-font-inverse;
Expand Down
8 changes: 8 additions & 0 deletions assets/scss/00-base/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,11 @@ $close-icon: '\00d7';
$fonts: "Texta", "Helvetica", "Arial", sans-serif;
$fonts-mono: "Source Code Pro", "Monaco", monospace;
$fonts-khmer: "Hanuman";


// font weights
$fonts-lighter: 300;
$fonts-light: 400;
$fonts-normal: 500;
$fonts-bold: 700;
$fonts-bolder: 800;
2 changes: 1 addition & 1 deletion assets/scss/00-base/mixins/_ma-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
// theme
@else {
font-weight: 700;
font-weight: $fonts-bold;

@if ($type == "solid") {
background-color: $color;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/00-base/mixins/_ma-truncated-body-text.scss
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
height: 60px;
background: transparent;
border: 0;
font-weight: 700;
font-weight: $fonts-bold;
color: $c-primary;

&::after {
Expand Down
10 changes: 5 additions & 5 deletions assets/scss/00-base/mixins/_ma-typography.scss
Original file line number Diff line number Diff line change
Expand Up @@ -90,39 +90,39 @@
@mixin ma-texta-style($weight: 'Light', $italic: false) {

@if ($weight == 'Light') {
font-weight: 300;
font-weight: $fonts-lighter;

@if ($italic == true) {
font-style: italic;
}
}

@if ($weight == 'Book') {
font-weight: 400;
font-weight: $fonts-light;

@if ($italic == true) {
font-style: italic;
}
}

@if ($weight == 'Medium') {
font-weight: 500;
font-weight: $fonts-normal;

@if ($italic == true) {
font-style: italic;
}
}

@if ($weight == 'Bold') {
font-weight: 700;
font-weight: $fonts-bold;

@if ($italic == true) {
font-style: italic;
}
}

@if ($weight == 'Black') {
font-weight: 800;
font-weight: $fonts-bolder;

@if ($italic == true) {
font-style: italic;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_address.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.ma__address {

&__address {
font-weight: 700;
font-weight: $fonts-bold;
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_button-search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
}
color: $color;
font-size: 14px;
font-weight: 700;
font-weight: $fonts-bold;

&:hover,
&:focus {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_button-sort.scss
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

.ma__button-sort {
color: $c-font-link;
font-weight: 700;
font-weight: $fonts-bold;

&--asc,
&--dsc {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_button-tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
white-space: nowrap;
background-color: tint($c-font-link,90%);
color: $c-font-link;
font-weight: 700;
font-weight: $fonts-bold;

&:after {
content: "+";
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_button-toggle.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

&--selected {
color: $c-font-base;
font-weight: 700;
font-weight: $fonts-bold;
pointer-events: none;
}
}
4 changes: 2 additions & 2 deletions assets/scss/01-atoms/_button-with-icon.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ $quaternary-colors: (
background-color: $c-white;
border: 2px solid $c-gray-light;
display: inline-block;
font-weight: 700;
font-weight: $fonts-bold;
letter-spacing: $letter-spacing-large;
padding: 10px 14px;
text-transform: uppercase;
Expand Down Expand Up @@ -200,7 +200,7 @@ $quaternary-colors: (

&--alert {
font-size: 16px;
font-weight: 700;
font-weight: $fonts-bold;
letter-spacing: $letter-spacing-large;
line-height: 1;
padding: .4em;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_buttons.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ $primarycolors: (
button {
cursor: pointer;
font-family: $fonts;
font-weight: 400;
font-weight: $fonts-light;
}

.ma__button {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_decorative-link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
}

&__details {
font-weight: 400;
font-weight: $fonts-light;
}

a {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_email.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.ma__email {

&__email {
font-weight: 700;
font-weight: $fonts-bold;
color: $c-font-detail;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_error-msg.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
font-size: 1.125rem;
line-height: 1.2rem;
margin: .3em 0;
font-weight: 500;
font-weight: $fonts-normal;

svg {
flex: 0 0 1.2rem;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_event-time.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.ma__event-time {

&__calendar, {
font-weight: 700;
font-weight: $fonts-bold;
line-height: 1.3;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_figure.scss
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,6 @@
.ma__figure {

&__caption {
font-weight: 300;
font-weight: $fonts-lighter;
}
}
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_fixed-feedback-button.scss
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
color: $c-primary-alt;
display: block;
font-size: 1.5rem;
font-weight: 500;
font-weight: $fonts-normal;
left: -40px;
letter-spacing: 0.15rem;
padding: 0 10px;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_footnote-link.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
display: inline-flex;
color: $c-font-link;
font-size: 1.25rem;
font-weight: 700;
font-weight: $fonts-bold;
line-height: 1;
}
4 changes: 2 additions & 2 deletions assets/scss/01-atoms/_footnote.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
span {
margin-bottom: 0px;
cursor: pointer;
font-weight: 400;
font-weight: $fonts-light;
font-size: 1.25rem;
color: $c-font-link;

a {
font-weight: 500;
font-weight: $fonts-normal;
border-bottom: 1px solid;
}

Expand Down
10 changes: 5 additions & 5 deletions assets/scss/01-atoms/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ input {
border: 2px solid $c-bd-input;
color: $c-font-base;
font-size: 1.375rem;
font-weight: 400;
font-weight: $fonts-light;
max-width: 100%;
min-height: 40px;
padding: 0 18px;
Expand All @@ -38,7 +38,7 @@ optgroup,
select,
textarea {
font-family: $fonts;
font-weight: 400;
font-weight: $fonts-light;
font-size: 1.375rem;
}

Expand Down Expand Up @@ -68,7 +68,7 @@ textarea {
background-color: $c-white;
border: 2px solid $c-bd-input;
font-size: 1.375rem;
font-weight: 400;
font-weight: $fonts-light;
max-width: 100%;
min-height: 135px;
padding: 18px;
Expand All @@ -93,7 +93,7 @@ label {
display: block;
margin-bottom: .25em;
padding: 0;
font-weight: 500;
font-weight: $fonts-normal;
}


Expand All @@ -105,7 +105,7 @@ fieldset {

optgroup,
select {
font-weight: 400;
font-weight: $fonts-light;
font-size: 1.375rem;
max-width: 100%;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_input-checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
}

label {
font-weight: 400;
font-weight: $fonts-light;

&:before {
background-color: $c-white;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_input-fuzzy.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
.react-autowhatever__input {
height: 30px;
padding: 10px 20px;
font-weight: 400;
font-weight: $fonts-light;
font-size: 1.375rem;
border: 2px solid $c-gray-light;
-webkit-appearance: none;
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_input-group.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
.ma__input-group {

&__title {
font-weight: 500;
font-weight: $fonts-normal;
}
}
4 changes: 2 additions & 2 deletions assets/scss/01-atoms/_input-radio.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
font-size: 1.375rem;
line-height: 1rem;
padding-left: 1.5em;
font-weight: 400;
font-weight: $fonts-light;

&:before {
border: 2px solid;
Expand Down Expand Up @@ -144,7 +144,7 @@ $control-height: 1.2rem;
height: 100%;
border-radius: $border-radius * 8;
z-index: -1; // so that background is behind everything
font-weight: 700; //fixed
font-weight: $fonts-bold; //fixed
transition: color .15s ease-in-out, background-color .15s ease-in-out, border-color .15s ease-in-out, box-shadow .15s ease-in-out;
border: 1px solid
}
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_phone-number.scss
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.ma__phone-number {

&__number {
font-weight: 700;
font-weight: $fonts-bold;
color: $c-font-detail;
}
}
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_publish-state.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@

.ma__publish-state {
color: $c-font-medium;
font-weight: 700;
font-weight: $fonts-bold;
}
4 changes: 2 additions & 2 deletions assets/scss/01-atoms/_select-box.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,12 +83,12 @@
.ma__select-box {

&__label {
font-weight: 500;
font-weight: $fonts-normal;
}

&__select {
color: $c-font-base;
font-weight: 300;
font-weight: $fonts-lighter;
}

&__link {
Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_site-logo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
a {

span {
font-weight: 400;
font-weight: $fonts-light;
color: $c-primary-alt;

-webkit-text-stroke-width: 1px;
Expand Down
4 changes: 2 additions & 2 deletions assets/scss/01-atoms/_table.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

&:before {
color: $c-font-heading;
font-weight: 500;
font-weight: $fonts-normal;
}
}

Expand Down Expand Up @@ -125,7 +125,7 @@

&:before {
color: $c-font-heading;
font-weight: 500;
font-weight: $fonts-normal;
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/scss/01-atoms/_textarea.scss
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.ma__textarea {

&__wrapper {
font-weight: 500;
font-weight: $fonts-normal;
}
}

Loading