diff --git a/src/global_styling/k6/_colors.scss b/src/global_styling/k6/_colors.scss new file mode 100644 index 000000000000..20accdc4926d --- /dev/null +++ b/src/global_styling/k6/_colors.scss @@ -0,0 +1 @@ +$euiTextColor: #2D2D2D; diff --git a/src/global_styling/k6/_index.scss b/src/global_styling/k6/_index.scss new file mode 100644 index 000000000000..0a49db677d8d --- /dev/null +++ b/src/global_styling/k6/_index.scss @@ -0,0 +1,6 @@ +@import 'size'; +@import 'colors'; +@import 'typography'; +// @import 'borders'; +// @import 'shadows'; +// @import 'z_index'; diff --git a/src/global_styling/k6/_size.scss b/src/global_styling/k6/_size.scss new file mode 100644 index 000000000000..af769bf620f8 --- /dev/null +++ b/src/global_styling/k6/_size.scss @@ -0,0 +1,7 @@ +$euiSizeXS: 4px; +$euiSizeS: 8px; +$euiSizeM: 11px; +$euiSize: 14px; +$euiSizeL: 18px; +$euiSizeXL: 22px; +$euiSizeXXL: 26px; diff --git a/src/global_styling/k6/_typography.scss b/src/global_styling/k6/_typography.scss new file mode 100644 index 000000000000..e1ae0be179f4 --- /dev/null +++ b/src/global_styling/k6/_typography.scss @@ -0,0 +1,7 @@ +$euiFontSizeXS: 10px; +$euiFontSizeS: 12px; +$euiFontSizeM: 14px; +$euiFontSize: 14px; +$euiFontSizeL: 18px; +$euiFontSizeXL: 22px; +$euiFontSizeXXL: 28px; diff --git a/src/global_styling/theme_light_variables.scss b/src/global_styling/theme_light_variables.scss index 2869d11f876a..e2cb9e7e2c42 100644 --- a/src/global_styling/theme_light_variables.scss +++ b/src/global_styling/theme_light_variables.scss @@ -1,2 +1,5 @@ +// K6 custom values +@import 'k6/index'; + // Configuration @import 'variables/index'; diff --git a/src/global_styling/variables/_size.scss b/src/global_styling/variables/_size.scss index 150b66eea1cc..b8ae115dea5b 100644 --- a/src/global_styling/variables/_size.scss +++ b/src/global_styling/variables/_size.scss @@ -1,10 +1,10 @@ -$euiSize: 16px; +$euiSize: 16px !default; -$euiSizeXS: $euiSize * .25; -$euiSizeS: $euiSize * .5; -$euiSizeM: $euiSize * .75; -$euiSizeL: $euiSize * 1.5; -$euiSizeXL: $euiSize * 2; -$euiSizeXXL: $euiSize * 2.5; +$euiSizeXS: $euiSize * .25 !default; +$euiSizeS: $euiSize * .5 !default; +$euiSizeM: $euiSize * .75 !default; +$euiSizeL: $euiSize * 1.5 !default; +$euiSizeXL: $euiSize * 2 !default; +$euiSizeXXL: $euiSize * 2.5 !default; -$euiButtonMinWidth: $euiSize * 7; +$euiButtonMinWidth: $euiSize * 7 !default; diff --git a/src/global_styling/variables/_typography.scss b/src/global_styling/variables/_typography.scss index 42eeff66edd7..2670dec3dc54 100644 --- a/src/global_styling/variables/_typography.scss +++ b/src/global_styling/variables/_typography.scss @@ -23,14 +23,14 @@ $euiCodeFontFamily: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, Courie // Font sizes -$euiFontSize: $euiSize; - -$euiFontSizeXS: $euiFontSize * .75; -$euiFontSizeS: $euiFontSize * .875; -$euiFontSizeM: $euiFontSize; -$euiFontSizeL: $euiFontSize * 1.5; -$euiFontSizeXL: $euiFontSize * 2; -$euiFontSizeXXL: $euiFontSize * 3; +$euiFontSize: $euiSize !default; + +$euiFontSizeXS: $euiFontSize * .75 !default; +$euiFontSizeS: $euiFontSize * .875 !default; +$euiFontSizeM: $euiFontSize !default; +$euiFontSizeL: $euiFontSize * 1.5 !default; +$euiFontSizeXL: $euiFontSize * 2 !default; +$euiFontSizeXXL: $euiFontSize * 3 !default; // Line height