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

GD-464: Replace font files affected by system font collision #703

Merged
merged 3 commits into from
Jun 8, 2023
Merged
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
10 changes: 5 additions & 5 deletions components/src/core/components/Calendar/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ $oxd-calendar-wrapper-background-color: $oxd-white-color !default;
$oxd-calendar-day-font-color: $oxd-interface-gray-color !default;
$oxd-calendar-day-font-family: $oxd-input-control-font-family !default;
$oxd-calendar-day-font-size: 14px !default;
$oxd-calendar-day-font-weight: 500 !default;
$oxd-calendar-day-font-weight: 600 !default;

$oxd-calendar-date-font-color: $oxd-interface-gray-darken-1-color !default;
$oxd-calendar-date-font-family: $oxd-input-control-font-family !default;
$oxd-calendar-date-font-size: $oxd-input-control-font-size !default;
$oxd-calendar-date-font-weight: 500 !default;
$oxd-calendar-date-font-weight: 600 !default;
$oxd-calendar-date-border-radius: 0.75rem !default;

$oxd-calendar-date-half-font-color: $oxd-interface-gray-darken-1-color !default;
Expand Down Expand Up @@ -41,15 +41,15 @@ $oxd-calendar-date-holiday-half-font-weight: 600 !default;

$oxd-calendar-date-highlight-full-background-color: #3bda98 !default;
$oxd-calendar-date-highlight-full-font-color: $oxd-white-color !default;
$oxd-calendar-date-highlight-full-font-weight: 500 !default;
$oxd-calendar-date-highlight-full-font-weight: 600 !default;

$oxd-calendar-date-highlight-half-background-color: #c9ffeb !default;
$oxd-calendar-date-highlight-half-font-color: #23b478 !default;
$oxd-calendar-date-highlight-half-font-weight: 500 !default;
$oxd-calendar-date-highlight-half-font-weight: 600 !default;

$oxd-calendar-date-weekend-background-color: $oxd-background-light-gray-color !default;
$oxd-calendar-date-weekend-font-color: $oxd-interface-gray-color !default;
$oxd-calendar-date-weekend-font-weight: 500 !default;
$oxd-calendar-date-weekend-font-weight: 600 !default;

$oxd-calendar-selector-padding: 0.125rem !default;
$oxd-calendar-selector-top-margin: 2.5rem !default;
Expand Down
4 changes: 2 additions & 2 deletions components/src/core/components/Input/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $oxd-file-button-height: 35px !default;
$oxd-file-button-width: 35px !default;
$oxd-file-upload-box-border: #cfd3de !default;
$oxd-file-upload-box-background: #f1f2f5 !default;
$oxd-file-upload-box-color: #64728c !default;;
$oxd-file-upload-box-color: #64728c !default;

$oxd-checkbox-label-color: $oxd-input-control-font-color !default;
$oxd-checkbox-label-color--disabled: $oxd-interface-gray-color !default;
Expand Down Expand Up @@ -149,7 +149,7 @@ $oxd-date-input-link-padding: 5px 10px !default;
$oxd-date-input-link-border-radius: 0.75rem !default;
$oxd-date-input-link-font-family: $oxd-input-control-font-family !default;
$oxd-date-input-link-font-color: $oxd-input-control-font-color !default;
$oxd-date-input-link-font-weight: 500 !default;
$oxd-date-input-link-font-weight: 600 !default;
$oxd-date-input-link-font-weight-hover: 600 !default;
$oxd-date-input-link-font-size: 14px !default;
$oxd-date-input-link-highlight-color: $oxd-primary-input-color !default;
Expand Down
2 changes: 1 addition & 1 deletion components/src/core/components/Text/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ $oxd-text-toast-title-letter-spacing: 0.15px !default;
$oxd-text-toast-title-color: $oxd-text-color !default;

$oxd-text-toast-message-font-size: 12px !default;
$oxd-text-toast-message-font-weight: 500 !default;
$oxd-text-toast-message-font-weight: 600 !default;
$oxd-text-toast-message-letter-spacing: 0.15px !default;
$oxd-text-toast-message-color: $oxd-text-color !default;

Expand Down
142 changes: 105 additions & 37 deletions components/src/styles/_typography.scss
Original file line number Diff line number Diff line change
@@ -1,73 +1,141 @@
/* nunito-200 - latin */
@font-face {
font-family: 'Nunito';
src: local('Nunito ExtraLight'), local('Nunito-ExtraLight'),
url('~assets/fonts/nunito/Nunito-ExtraLight.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-ExtraLight.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-ExtraLight.ttf') format('truetype');
font-weight: 200;
font-style: normal;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito ExtraLight Italic'), local('Nunito-ExtraLightItalic'),
url('~assets/fonts/nunito/Nunito-ExtraLightItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-ExtraLightItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-ExtraLightItalic.ttf') format('truetype');
font-weight: 200;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-200.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-200.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
font-style: italic;
}
/* nunito-300 - latin */

@font-face {
font-family: 'Nunito';
src: local('Nunito Light'), local('Nunito-Light'),
url('~assets/fonts/nunito/Nunito-Light.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-Light.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-Light.ttf') format('truetype');
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito Light Italic'), local('Nunito-LightItalic'),
url('~assets/fonts/nunito/Nunito-LightItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-LightItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-LightItalic.ttf') format('truetype');
font-weight: 300;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-300.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-300.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
font-style: italic;
}
/* nunito-regular - latin */

@font-face {
font-family: 'Nunito';
src: local('Nunito SemiBold'), local('Nunito-SemiBold'),
url('~assets/fonts/nunito/Nunito-SemiBold.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-SemiBold.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-SemiBold.ttf') format('truetype');
font-weight: 600;
font-style: normal;
font-weight: 400;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-regular.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-regular.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* nunito-600 - latin */

@font-face {
font-family: 'Nunito';
font-style: normal;
src: local('Nunito SemiBold Italic'), local('Nunito-SemiBoldItalic'),
url('~assets/fonts/nunito/Nunito-SemiBoldItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-SemiBoldItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-SemiBoldItalic.ttf') format('truetype');
font-weight: 600;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-600.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-600.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
font-style: italic;
}
/* nunito-700 - latin */

@font-face {
font-family: 'Nunito';
src: local('Nunito ExtraBold'), local('Nunito-ExtraBold'),
url('~assets/fonts/nunito/Nunito-ExtraBold.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-ExtraBold.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-ExtraBold.ttf') format('truetype');
font-weight: 800;
font-style: normal;
font-weight: 700;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-700.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-700.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}
/* nunito-800 - latin */

@font-face {
font-family: 'Nunito';
font-style: normal;
src: local('Nunito ExtraBold Italic'), local('Nunito-ExtraBoldItalic'),
url('~assets/fonts/nunito/Nunito-ExtraBoldItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-ExtraBoldItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-ExtraBoldItalic.ttf') format('truetype');
font-weight: 800;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-800.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-800.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
font-style: italic;
}
/* nunito-900 - latin */

@font-face {
font-family: 'Nunito';
src: local('Nunito Black'), local('Nunito-Black'),
url('~assets/fonts/nunito/Nunito-Black.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-Black.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-Black.ttf') format('truetype');
font-weight: 900;
font-style: normal;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito Black Italic'), local('Nunito-BlackItalic'),
url('~assets/fonts/nunito/Nunito-BlackItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-BlackItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-BlackItalic.ttf') format('truetype');
font-weight: 900;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-900.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-900.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
font-style: italic;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito Regular'), local('Nunito-Regular'),
url('~assets/fonts/nunito/Nunito-Regular.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-Regular.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-Regular.ttf') format('truetype');
font-weight: normal;
font-style: normal;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito Italic'), local('Nunito-Italic'),
url('~assets/fonts/nunito/Nunito-Italic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-Italic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-Italic.ttf') format('truetype');
font-weight: normal;
font-style: italic;
}

@font-face {
font-family: 'Nunito';
src: local('Nunito Bold'), local('Nunito-Bold'),
url('~assets/fonts/nunito/Nunito-Bold.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-Bold.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-Bold.ttf') format('truetype');
font-weight: bold;
font-style: normal;
}
/* nunito-italic - latin */

@font-face {
font-family: 'Nunito';
src: local('Nunito Bold Italic'), local('Nunito-BoldItalic'),
url('~assets/fonts/nunito/Nunito-BoldItalic.woff2') format('woff2'),
url('~assets/fonts/nunito/Nunito-BoldItalic.woff') format('woff'),
url('~assets/fonts/nunito/Nunito-BoldItalic.ttf') format('truetype');
font-weight: bold;
font-style: italic;
font-weight: 400;
src: local(''),
url('~assets/fonts/nunito/nunito-v20-latin-italic.woff2') format('woff2'), /* Chrome 26+, Opera 23+, Firefox 39+ */
url('~assets/fonts/nunito/nunito-v20-latin-italic.woff') format('woff'); /* Chrome 6+, Firefox 3.6+, IE 9+, Safari 5.1+ */
}

$oxd-font-family: 'Nunito', sans-serif !default;