From 706654082d96dadeb0295e7b78e0837690fac1e1 Mon Sep 17 00:00:00 2001 From: Philippe Rail Date: Fri, 2 Feb 2018 11:28:05 -0500 Subject: [PATCH 01/17] Seven shades of grey --- src/components/datepicker/datepicker.scss | 2 +- src/components/dialog/dialog.scss | 2 +- src/components/fullpage/fullpage.scss | 4 +- src/components/icon-button/icon-button.scss | 2 +- src/components/input-style/input-style.scss | 2 +- src/components/menu-item/menu-item.scss | 2 +- src/components/navbar-item/navbar-item.scss | 2 +- src/components/panel/panel.scss | 2 +- src/components/scroll-top/scroll-top.scss | 2 +- src/styles/abstracts/_mixins.scss | 8 ++-- src/styles/abstracts/_var-color.scss | 43 ++++++++------------- src/styles/base/_typography.scss | 4 +- 12 files changed, 33 insertions(+), 42 deletions(-) diff --git a/src/components/datepicker/datepicker.scss b/src/components/datepicker/datepicker.scss index 8843ab062..7682dbaad 100644 --- a/src/components/datepicker/datepicker.scss +++ b/src/components/datepicker/datepicker.scss @@ -62,7 +62,7 @@ $m-datepicker--item-dimension: $m-touch-size !default; &:hover, &:focus { - color: $m-color--black-grey-lighter; + color: $m-color--grey-darker; } } diff --git a/src/components/dialog/dialog.scss b/src/components/dialog/dialog.scss index be08276a0..02ba47bf1 100644 --- a/src/components/dialog/dialog.scss +++ b/src/components/dialog/dialog.scss @@ -148,7 +148,7 @@ $m-dialog--max-width--s: 420px !default; &__header { position: relative; - background: $m-color--black-grey; + background: $m-color--grey-darker; color: $m-color--white; justify-content: space-between; diff --git a/src/components/fullpage/fullpage.scss b/src/components/fullpage/fullpage.scss index dcddc8b3a..f0e5b3b06 100644 --- a/src/components/fullpage/fullpage.scss +++ b/src/components/fullpage/fullpage.scss @@ -80,7 +80,7 @@ } &__header { - background-color: $m-color--black-grey; + background-color: $m-color--grey-darker; display: flex; align-items: center; justify-content: space-between; @@ -104,7 +104,7 @@ align-items: center; justify-content: center; width: var(--m-min-height-header); - background-color: $m-color--black-grey-darker; + background-color: $m-color--grey-darkest; } &__center { diff --git a/src/components/icon-button/icon-button.scss b/src/components/icon-button/icon-button.scss index bbf13fa8b..ccb39d1e8 100644 --- a/src/components/icon-button/icon-button.scss +++ b/src/components/icon-button/icon-button.scss @@ -53,7 +53,7 @@ } &::before { - background: $m-color--black-grey-light; + background: $m-color--grey-dark; } } diff --git a/src/components/input-style/input-style.scss b/src/components/input-style/input-style.scss index 84aa14844..65d0f1510 100644 --- a/src/components/input-style/input-style.scss +++ b/src/components/input-style/input-style.scss @@ -209,7 +209,7 @@ $m-input-style--padding: 6px !default; margin-bottom: 4px; // Magic number font-size: $m-font-size; font-weight: $m-font-weight; - color: $m-color--black-grey-lighter; + color: $m-color--grey-darker; cursor: pointer; .m-icon { diff --git a/src/components/menu-item/menu-item.scss b/src/components/menu-item/menu-item.scss index f44e26180..32a845bd0 100644 --- a/src/components/menu-item/menu-item.scss +++ b/src/components/menu-item/menu-item.scss @@ -48,7 +48,7 @@ $m-menu-item--color-active: $m-color--grey-lightest !default; .m-menu-item { &__icon { - color: $m-color--black-grey; + color: $m-color--grey-darker; } } } diff --git a/src/components/navbar-item/navbar-item.scss b/src/components/navbar-item/navbar-item.scss index 7c0e71fb2..9d44682e5 100644 --- a/src/components/navbar-item/navbar-item.scss +++ b/src/components/navbar-item/navbar-item.scss @@ -90,7 +90,7 @@ a { a, button { color: $m-color--white; - background: $m-color--black-grey-light; + background: $m-color--grey-dark; } } } diff --git a/src/components/panel/panel.scss b/src/components/panel/panel.scss index bf7c2a174..4425deb4f 100644 --- a/src/components/panel/panel.scss +++ b/src/components/panel/panel.scss @@ -20,7 +20,7 @@ $m-panel--screen--min: 640px; } &.m--is-skin-darker { - background: $m-color--black-grey; + background: $m-color--grey-darker; color: $m-color--white; } diff --git a/src/components/scroll-top/scroll-top.scss b/src/components/scroll-top/scroll-top.scss index 80abf6a84..3de9eb188 100644 --- a/src/components/scroll-top/scroll-top.scss +++ b/src/components/scroll-top/scroll-top.scss @@ -19,7 +19,7 @@ width: 28px; height: 28px; padding: 0; - background-color: $m-color--black-grey-dark; + background-color: $m-color--grey-darker; border: none; border-radius: $m-border-radius--s; opacity: 0.3; diff --git a/src/styles/abstracts/_mixins.scss b/src/styles/abstracts/_mixins.scss index e579de521..66d3211a1 100644 --- a/src/styles/abstracts/_mixins.scss +++ b/src/styles/abstracts/_mixins.scss @@ -145,17 +145,17 @@ > ul > li::before, &::before { border-radius: 50%; - border: 1px solid $m-color--black-grey-light; + border: 1px solid $m-color--grey-dark; } &::before, > ul > li > ul > li::before { - background: $m-color--black-grey-light; + background: $m-color--grey-dark; } > ul > li > ul > li::before, > ul > li > ul > li > ul > li::before { - border: 1px solid $m-color--black-grey-light; + border: 1px solid $m-color--grey-dark; } > ul > li > ul > li > ul > li > ul > li::before { @@ -163,7 +163,7 @@ height: 0; border-style: solid; border-width: 3px 0 3px 4px; - border-color: rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) $m-color--black-grey-light; + border-color: rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) rgba(0, 0, 0, 0) $m-color--grey-dark; } } } diff --git a/src/styles/abstracts/_var-color.scss b/src/styles/abstracts/_var-color.scss index 74ef310a5..c9b5c4c1e 100644 --- a/src/styles/abstracts/_var-color.scss +++ b/src/styles/abstracts/_var-color.scss @@ -5,55 +5,46 @@ $m-color--ul-blue: #09f; $m-color--ul-yellow: #ffc103; $m-color--ul-red: #e30513; -// ====================================================================== -// Black grey -// ====================================================================== -$m-color--black-grey-darker: #232323 !default; -$m-color--black-grey-dark: #2e2e2e !default; -$m-color--black-grey: #3d3d3d !default; -$m-color--black-grey-light: #4f4f4f !default; -$m-color--black-grey-lighter: #666 !default; - // ====================================================================== // Grey // ====================================================================== -$m-color--grey-darker: #999 !default; -$m-color--grey-dark: #b0b0b0 !default; -$m-color--grey: #dadada !default; -$m-color--grey-light: #e8e8e8 !default; -$m-color--grey-lighter: #f1f1f1 !default; -$m-color--grey-lightest: #f7f7f7 !default; +$m-color--grey-darkest: #1f1f1f !default; +$m-color--grey-darker: #3d3d3d !default; +$m-color--grey-dark: #696969 !default; +$m-color--grey: #929292 !default; +$m-color--grey-light: #d7d7d7 !default; +$m-color--grey-lighter: #f4f4f4 !default; +$m-color--grey-lightest: #f9f9f9 !default; // ====================================================================== // General color // ====================================================================== $m-color--black: #000; -$m-color--text: $m-color--black-grey; +$m-color--text: $m-color--grey-darker; $m-color--white: #fff; // ====================================================================== // Success colors // ====================================================================== -$m-color--success-dark: #008964 !default; +$m-color--success-dark: #009962 !default; $m-color--success: #00c77f !default; -$m-color--success-light: #abe5c3 !default; +$m-color--success-light: #cdf3e3 !default; $m-color--success-lightest: #eaf9f1 !default; // ====================================================================== // Warning colors // ====================================================================== -$m-color--warning-dark: #edaf00 !default; +// $m-color--warning-dark: #edaf00 !default; $m-color--warning: $m-color--ul-yellow !default; -$m-color--warning-light: #ffec5d !default; -$m-color--warning-lightest: #fffdcf !default; +// $m-color--warning-light: #ffec5d !default; +$m-color--warning-lightest: #fff8e6 !default; // ====================================================================== // Error colors // ====================================================================== -$m-color--error-dark: #c00 !default; +$m-color--error-dark: #b3040f !default; $m-color--error: $m-color--ul-red !default; -$m-color--error-light: #f7081f !default; -$m-color--error-lightest: #ffdcdc !default; +$m-color--error-lightest: #fcf2f3 !default; // ====================================================================== // Interactive colors @@ -77,9 +68,9 @@ $m-color--accent-lightest: #ffeecf !default; // ====================================================================== // Active colors // ====================================================================== -$m-color--active-dark: $m-color--warning-dark !default; +// $m-color--active-dark: $m-color--warning-dark !default; $m-color--active: $m-color--ul-yellow !default; -$m-color--active-light: $m-color--warning-light !default; +// $m-color--active-light: $m-color--warning-light !default; $m-color--active-lightest: $m-color--warning-lightest !default; // ====================================================================== diff --git a/src/styles/base/_typography.scss b/src/styles/base/_typography.scss index 4d30319fd..a99a33fa3 100644 --- a/src/styles/base/_typography.scss +++ b/src/styles/base/_typography.scss @@ -183,7 +183,7 @@ a { font-family: $m-font-family; font-size: $m-font-size--s; font-weight: $m-font-weight--bold; - background: $m-color--warning-light; - box-shadow: 0 0 0 2px $m-color--warning-light; + background: $m-color--warning-lightest; + box-shadow: 0 0 0 2px $m-color--warning-lightest; } } From a5a57c6ec1eca80354b589a3a2e6b9ac66ee06af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Par=C3=A9?= Date: Fri, 2 Feb 2018 13:55:05 -0500 Subject: [PATCH 02/17] Update input-width --- src/components/dropdown/dropdown.html | 4 +- src/components/dropdown/dropdown.ts | 6 +-- src/components/textarea/textarea.html | 2 +- src/components/textarea/textarea.ts | 10 ++--- src/components/textfield/textfield.html | 3 +- src/components/textfield/textfield.ts | 4 +- src/mixins/input-width/input-width.ts | 54 +++++++++++++++++++++++++ 7 files changed, 70 insertions(+), 13 deletions(-) create mode 100644 src/mixins/input-width/input-width.ts diff --git a/src/components/dropdown/dropdown.html b/src/components/dropdown/dropdown.html index 2796ed35d..ce09b338e 100644 --- a/src/components/dropdown/dropdown.html +++ b/src/components/dropdown/dropdown.html @@ -1,6 +1,6 @@