diff options
| author | Denis Anisimov <denis@vaadin.com> | 2014-11-07 13:53:45 +0200 |
|---|---|---|
| committer | Henri Sara <hesara@vaadin.com> | 2015-05-12 11:38:36 +0300 |
| commit | dc8d50c1c0f69c13e0815eb0dfddad5993712850 (patch) | |
| tree | 898ad6c6345a049bf930c202e9ddb901dfa8b149 /WebContent/VAADIN | |
| parent | 2a0547e01ab51585ceced130a906b15f1292e25e (diff) | |
| download | vaadin-framework-7.4.6.tar.gz vaadin-framework-7.4.6.zip | |
Provide variable for default contrast value in valo-font-color (#14793).7.4.6
Change-Id: Ia6aa73d6b4a9ae6518a57a601bf4a6525572724a
Diffstat (limited to 'WebContent/VAADIN')
| -rw-r--r-- | WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss | 3 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/tests-valo-contrast/styles.scss | 6 | ||||
| -rw-r--r-- | WebContent/VAADIN/themes/valo/util/_color.scss | 10 |
3 files changed, 18 insertions, 1 deletions
diff --git a/WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss b/WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss new file mode 100644 index 0000000000..962bc8f299 --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-contrast/_variables.scss @@ -0,0 +1,3 @@ +$v-font-color-contrast: 0.1; + +@import "../valo/valo"; diff --git a/WebContent/VAADIN/themes/tests-valo-contrast/styles.scss b/WebContent/VAADIN/themes/tests-valo-contrast/styles.scss new file mode 100644 index 0000000000..231a9de50d --- /dev/null +++ b/WebContent/VAADIN/themes/tests-valo-contrast/styles.scss @@ -0,0 +1,6 @@ +@import "variables"; +@import "../tests-valo/valotest"; + +.tests-valo-contrast { + @include valotest; +} diff --git a/WebContent/VAADIN/themes/valo/util/_color.scss b/WebContent/VAADIN/themes/valo/util/_color.scss index 37612fd48d..e4aab4596d 100644 --- a/WebContent/VAADIN/themes/valo/util/_color.scss +++ b/WebContent/VAADIN/themes/valo/util/_color.scss @@ -32,6 +32,14 @@ $v-luminance-threshold: 150 !default; /** + * Contrast default value for valo-font-color function. + * + * @group color + * @type number + */ +$v-font-color-contrast: 0.72 !default; + +/** * Checks whether the color is considered dark or light, according to it's luminance and saturation. * * @group color @@ -80,7 +88,7 @@ $v-luminance-threshold: 150 !default; * * @return {color} a suitable font color for the given background color */ -@function valo-font-color ($bg-color, $contrast: 0.72) { +@function valo-font-color ($bg-color, $contrast: $v-font-color-contrast) { @if type-of($bg-color) == color { @if is-dark-color($bg-color) { @return scale-color($bg-color, $lightness: min(100%, 100% * $contrast), $saturation: max(-100%, -50% * $contrast)); |