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

[Backport 1.x] [New Theme] Introduce the first installment of the new look and feel #832

Merged
merged 1 commit into from
Jun 20, 2023
Merged

[Backport 1.x] [New Theme] Introduce the first installment of the new look and feel #832

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
1 change: 0 additions & 1 deletion src/components/text/_text.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@
text-align: center;
margin-left: auto;
margin-right: auto;
font-family: Georgia, Times, Times New Roman, serif;
font-style: italic;
letter-spacing: normal;

Expand Down
9 changes: 9 additions & 0 deletions src/theme_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,12 @@

// Packages
@import '../packages/index';

/* During creation of the new theme, these rules had to be
* removed from the components. To make sure the theme retains
* its looks, they are reintroduced here.
*/

.ouiText blockquote {
font-family: Georgia, Times, Times New Roman, serif;
}
9 changes: 9 additions & 0 deletions src/theme_light.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,12 @@

// Packages
@import '../packages/index';

/* During creation of the new theme, these rules had to be
* removed from the components. To make sure the theme retains
* its looks, they are reintroduced here.
*/

.ouiText blockquote {
font-family: Georgia, Times, Times New Roman, serif;
}
1 change: 1 addition & 0 deletions src/themes/oui-cascadia/global_styling/mixins/_button.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@

text-decoration: none;
border: solid 1px transparent;
font-weight: 600;

// sass-lint:disable mixins-before-declarations
// focus states should come after all default styles
Expand Down
1 change: 0 additions & 1 deletion src/themes/oui-cascadia/global_styling/mixins/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
@mixin ouiFont {
font-family: var(--oui-font-family);
font-weight: $ouiFontWeightRegular;
letter-spacing: -.005em;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
font-kerning: normal;
Expand Down
22 changes: 11 additions & 11 deletions src/themes/oui-cascadia/global_styling/variables/_colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
@import '../functions/index';

// These colors stay the same no matter the theme
$ouiColorGhost: #FFF !default;
$ouiColorInk: #000 !default;
$ouiColorGhost: #FCFEFF !default;
$ouiColorInk: #0A121A !default;

// Core
$ouiColorPrimary: #006BB4 !default;
$ouiColorPrimary: #159D8D !default;
$ouiColorSecondary: #017D73 !default;
$ouiColorAccent: #DD0A73 !default;

Expand All @@ -27,16 +27,16 @@ $ouiColorWarning: #F5A700 !default;
$ouiColorDanger: #BD271E !default;

// Grays
$ouiColorEmptyShade: #FFF !default;
$ouiColorLightestShade: #F5F7FA !default;
$ouiColorLightShade: #D3DAE6 !default;
$ouiColorMediumShade: #98A2B3 !default;
$ouiColorDarkShade: #69707D !default;
$ouiColorDarkestShade: #343741 !default;
$ouiColorFullShade: #000 !default;
$ouiColorEmptyShade: #FCFEFF !default;
$ouiColorLightestShade: #E3E5E8 !default;
$ouiColorLightShade: #D6D9DD !default;
$ouiColorMediumShade: #ADB4BA !default;
$ouiColorDarkShade: #5A6875 !default;
$ouiColorDarkestShade: #2A3947 !default;
$ouiColorFullShade: #0A1219 !default;

// Backgrounds
$ouiPageBackgroundColor: tint($ouiColorLightestShade, 50%) !default;
$ouiPageBackgroundColor: #F0F2F4 !default;
$ouiColorHighlight: #FFFCDD !default;

// Every color below must be based mathematically on the set above and in a particular order.
Expand Down
6 changes: 4 additions & 2 deletions src/themes/oui-cascadia/global_styling/variables/_typography.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@
}

// sass-lint:disable quotes
$ouiFontFamily: #{"'Inter UI', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'"} !default;
$ouiCodeFontFamily: #{"'Roboto Mono', Consolas, Menlo, Courier, monospace"} !default;
$ouiFontFamily: #{"'Source Sans 3', -apple-system, BlinkMacSystemFont, 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'"} !default;
$ouiCodeFontFamily: #{"'Source Code Pro', Consolas, Menlo, Courier, monospace"} !default;
// sass-lint:enable quotes

// Careful using ligatures. Code editors like ACE will often error because of width calculations
Expand Down Expand Up @@ -76,11 +76,13 @@ $ouiTitles: (
'font-size': $ouiFontSizeXS,
'line-height': lineHeightFromBaseline(3),
'font-weight': $ouiFontWeightBold,
'letter-spacing': -.005em,
),
'xxs': (
'font-size': $ouiFontSizeS,
'line-height': lineHeightFromBaseline(3),
'font-weight': $ouiFontWeightBold,
'letter-spacing': -.005em,
),
'xs': (
'font-size': $ouiFontSize,
Expand Down
22 changes: 11 additions & 11 deletions src/themes/oui-cascadia/oui_cascadia_colors_dark.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
@import 'global_styling/functions/index';

// These colors stay the same no matter the theme
$ouiColorGhost: #FFF;
$ouiColorInk: #000;
$ouiColorGhost: #FCFEFF;
$ouiColorInk: #0A121A;

// Core
$ouiColorPrimary: #1BA9F5;
$ouiColorPrimary: #159D8D;
$ouiColorSecondary: #7DE2D1;
$ouiColorAccent: #F990C0;

Expand All @@ -26,16 +26,16 @@ $ouiColorWarning: #FFCE7A;
$ouiColorDanger: #F66;

// Grays
$ouiColorEmptyShade: #1D1E24;
$ouiColorLightestShade: #25262E;
$ouiColorLightShade: #343741;
$ouiColorMediumShade: #535966;
$ouiColorDarkShade: #98A2B3;
$ouiColorDarkestShade: #D4DAE5;
$ouiColorFullShade: #FFF;
$ouiColorEmptyShade: #0A121A;
$ouiColorLightestShade: #101B25;
$ouiColorLightShade: #293847;
$ouiColorMediumShade: #5B6875;
$ouiColorDarkShade: #8D98A3;
$ouiColorDarkestShade: #DFE3E8;
$ouiColorFullShade: #FCFEFF;

// Backgrounds
$ouiPageBackgroundColor: shade($ouiColorLightestShade, 45%);
$ouiPageBackgroundColor: #172430;
$ouiColorHighlight: #2E2D25;

// Variations from core
Expand Down