diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-05-06 11:32:42 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-06 11:32:42 -0400 |
commit | 06770656ebe36191a5f60895af187fb347e13510 (patch) | |
tree | de3217e4b36eb8d53887d9488277a6a6ee52fa2d /app/javascript/flavours/glitch/styles/variables.scss | |
parent | e56639258a0d12a7ca3cfcfe528da441341e78eb (diff) | |
parent | 65349bc155b4e3fb99721758944e19dd5af31489 (diff) |
Merge pull request #459 from ThibG/glitch-soc/features/text-color-variables
Add text color variables + minor SCSS fixes + high contrast skin
Diffstat (limited to 'app/javascript/flavours/glitch/styles/variables.scss')
-rw-r--r-- | app/javascript/flavours/glitch/styles/variables.scss | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/app/javascript/flavours/glitch/styles/variables.scss b/app/javascript/flavours/glitch/styles/variables.scss index e3ba725c4..cc08fd06f 100644 --- a/app/javascript/flavours/glitch/styles/variables.scss +++ b/app/javascript/flavours/glitch/styles/variables.scss @@ -17,7 +17,6 @@ $base-shadow-color: $black !default; $base-overlay-background: $black !default; $base-border-color: $white !default; $simple-background-color: $white !default; -$primary-text-color: $white !default; $valid-value-color: $success-green !default; $error-value-color: $error-red !default; @@ -26,7 +25,19 @@ $ui-base-color: $classic-base-color !default; // Darkest $ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest $ui-primary-color: $classic-primary-color !default; // Lighter $ui-secondary-color: $classic-secondary-color !default; // Lightest -$ui-highlight-color: $classic-highlight-color !default; // Vibrant +$ui-highlight-color: $classic-highlight-color !default; + +// Variables for texts +$primary-text-color: $white !default; +$darker-text-color: $ui-primary-color !default; +$dark-text-color: $ui-base-lighter-color !default; +$secondary-text-color: $ui-secondary-color !default; +$highlight-text-color: $ui-highlight-color !default; +$action-button-color: $ui-base-lighter-color !default; +// For texts on inverted backgrounds +$inverted-text-color: $ui-base-color !default; +$lighter-text-color: $ui-base-lighter-color !default; +$light-text-color: $ui-primary-color !default; // Language codes that uses CJK fonts $cjk-langs: ja, ko, zh-CN, zh-HK, zh-TW; |