From ba88cf2990210647e4205a16f3c700c1e849b3d9 Mon Sep 17 00:00:00 2001 From: yangchch6 Date: Tue, 22 Jan 2019 11:48:39 +0800 Subject: [PATCH] =?UTF-8?q?dark=E3=80=81light=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scss/minxin-themeColors.scss | 11 +++++------ scss/minxin-variables.scss | 8 ++++++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scss/minxin-themeColors.scss b/scss/minxin-themeColors.scss index afb7c7e..eb56bbd 100644 --- a/scss/minxin-themeColors.scss +++ b/scss/minxin-themeColors.scss @@ -15,7 +15,7 @@ $color-primary: $palette-blue-600 !default; $color-primary-dark: $palette-blue-800 !default; $color-primary-light: $palette-blue-400 !default; -// 次按钮 +// 次按钮背景色 $secondary-color: $palette-grey-300 !default; $secondary-color-dark: $palette-grey-400 !default; $secondary-color-light: $palette-grey-200 !default; @@ -26,6 +26,7 @@ $font-family-primary: "Open Sans", "Helvetica Neue", Arial, "Hiragino Sans GB", $font-size-base: 14px !default; // 主文本色 $text-color-base: $color-dark-contrast !default; + // 边框色 $border-color: $palette-grey-400 !default; // 条目hover背景色,包括:select、dropdown、table、datepicker、tree、menu等 @@ -34,11 +35,9 @@ $item-hover-bg-color-base: $palette-blue-50 !default; $item-selected-bg-color-base: "247,247,247" !default; // Button 细化样式变量: -// 1.次按钮背景色 -// $button-secondary-bg-color: $color-dark-contrast !default; -// 2.次按钮边框色 -// $button-secondary-border-color: $palette-u-gray-700 !default; -// 3.次按钮文本色 +// 主按钮文本色 +// $button-primary-text-color: $color-dark-contrast !default; +// 次按钮文本色 $button-secondary-text-color: $color-light-contrast !default; // 辅色 diff --git a/scss/minxin-variables.scss b/scss/minxin-variables.scss index eb5cd2e..7281ae8 100644 --- a/scss/minxin-variables.scss +++ b/scss/minxin-variables.scss @@ -186,6 +186,10 @@ $brand-dark: $gray-darker; $brand-dark-hover: $gray-dark; $brand-dark-active: $gray-darkest; +$brand-light : unquote("rgb(#{$color-dark-contrast})") !default; +$brand-light-hover: unquote("rgb(#{$palette-grey-200})") !default; +$brand-light-active: unquote("rgb(#{$palette-grey-400})") !default; + $brand-light-primary : unquote("rgb(#{$palette-blue-100})") !default; $brand-light-success: unquote("rgb(#{$palette-green-100})") !default; $brand-light-info: unquote("rgb(#{$palette-cyan-100})") !default; @@ -200,6 +204,7 @@ $color-success: unquote("rgb(#{$palette-green-500})") !default; $color-info: unquote("rgb(#{$palette-cyan-500})") !default; $color-warning: unquote("rgb(#{$palette-orange-500})") !default; $color-danger: unquote("rgb(#{$palette-red-500})") !default; +$color-light: $gray-darker !default; //redius @@ -247,6 +252,9 @@ $button-danger-hover-color: $brand-danger-hover; $button-dark-color: $brand-dark; $button-dark-active-color: $brand-dark-active; $button-dark-hover-color: $brand-dark-hover; +$button-light-color: $brand-light; +$button-light-active-color: $brand-light-active; +$button-light-hover-color: $brand-light-hover; // Button 文字颜色. // 主按钮(colors:'primary')