From 7401ec352aa6f9aa3a40ee0f403a6d1f9f0a4d74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=81=8F?= <admin@aresn.com>
Date: Mon, 2 Jul 2018 10:19:33 +0800
Subject: [PATCH] update colors
---
src/components/color-picker/color-picker.vue | 2 +-
src/styles/custom.less | 18 +++++++++---------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/color-picker/color-picker.vue b/src/components/color-picker/color-picker.vue
index 9159f2ea..9f6dab3d 100644
--- a/src/components/color-picker/color-picker.vue
+++ b/src/components/color-picker/color-picker.vue
@@ -221,7 +221,7 @@ export default {
'#2d8cf0',
'#19be6b',
'#ff9900',
- '#ed3f14',
+ '#ed4014',
'#00b5ff',
'#19c919',
'#f9e31c',
diff --git a/src/styles/custom.less b/src/styles/custom.less
index 9317559c..351f2ba6 100644
--- a/src/styles/custom.less
+++ b/src/styles/custom.less
@@ -10,22 +10,22 @@
@success-color : #19be6b;
@processing-color : @primary-color;
@warning-color : #ff9900;
-@error-color : #ed3f14;
+@error-color : #ed4014;
@normal-color : #e6ebf1;
@link-color : #2D8cF0;
@link-hover-color : tint(@link-color, 20%);
@link-active-color : shade(@link-color, 5%);
@selected-color : fade(@primary-color, 90%);
@tooltip-color : #fff;
-@subsidiary-color : #80848f;
+@subsidiary-color : #808695;
@rate-star-color : #f5a623;
// Base
@body-background : #fff;
@font-family : "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif;
@code-family : Consolas,Menlo,Courier,monospace;
-@title-color : #1c2438;
-@text-color : #495060;
+@title-color : #17233d;
+@text-color : #515a6e;
@font-size-base : 14px;
@font-size-small : 12px;
@font-size-large : 16px;
@@ -36,8 +36,8 @@
@cursor-disabled : not-allowed;
// Border color
-@border-color-base : #dddee1; // outside
-@border-color-split : #e9eaec; // inside
+@border-color-base : #dcdee2; // outside
+@border-color-split : #e8eaec; // inside
@border-width-base : 1px; // width of the border for a component
@border-style-base : solid; // style of a components border
@@ -50,7 +50,7 @@
@table-td-stripe-bg : #f8f8f9;
@table-td-hover-bg : #ebf7ff;
@table-td-highlight-bg : #ebf7ff;
-@menu-dark-title : #495060;
+@menu-dark-title : #515a6e;
@menu-dark-active-bg : #363e4f;
@menu-dark-subsidiary-color : rgba(255,255,255,.7);
@menu-dark-group-title-color : rgba(255,255,255,.36);
@@ -76,7 +76,7 @@
@btn-border-radius-small: 3px;
@btn-group-border : shade(@primary-color, 5%);
-@btn-disable-color : #bbbec4;
+@btn-disable-color : #c5c8ce;
@btn-disable-bg : @background-color-base;
@btn-disable-border : @border-color-base;
@@ -99,7 +99,7 @@
@grid-columns : 24;
@grid-gutter-width : 0;
@layout-body-background : #f5f7f9;
-@layout-header-background : #495060;
+@layout-header-background : #515a6e;
@layout-header-height : 64px;
@layout-header-padding : 0 50px;
@layout-footer-padding : 24px 50px;