diff --git a/style/mixins/button.less b/style/mixins/button.less index 59aea05d2a..36a635faa8 100644 --- a/style/mixins/button.less +++ b/style/mixins/button.less @@ -147,11 +147,11 @@ .button-variant(@btn-default-color; @btn-default-bg; @btn-default-border); &:hover { - .button-color(tint(@primary-color, 20%); @white; tint(@primary-color, 20%)); + .button-color(tint(@primary-color, 20%); white; tint(@primary-color, 20%)); } &:active, &.active { - .button-color(shade(@primary-color, 5%); @white; shade(@primary-color, 5%)); + .button-color(shade(@primary-color, 5%); white; shade(@primary-color, 5%)); } } @@ -160,11 +160,11 @@ .button-variant(@btn-ghost-color, @btn-ghost-bg, @btn-ghost-border); &:hover { - .button-color(tint(@primary-color, 20%); @white; tint(@primary-color, 20%)); + .button-color(tint(@primary-color, 20%); white; tint(@primary-color, 20%)); } &:active, &.active { - .button-color(shade(@primary-color, 5%); @white; shade(@primary-color, 5%)); + .button-color(shade(@primary-color, 5%); white; shade(@primary-color, 5%)); } } diff --git a/style/themes/default/color.less b/style/themes/default/color.less deleted file mode 100644 index c639cb4482..0000000000 --- a/style/themes/default/color.less +++ /dev/null @@ -1,159 +0,0 @@ -// red -@red-100: #FCC7C3; -@red-200: #FAA29B; -@red-300: #F87C73; -@red-400: #F55F54; -@red-500: #F44336; -@red-600: #DC3C31; -@red-700: #C3362B; -@red-800: #AB2F26; -@red-900: #922820; -@red-1000: #7A221B; - -// pink -@pink-100: #F9BCD1; -@pink-200: #F58FB2; -@pink-300: #F06292; -@pink-400: #EC407A; -@pink-500: #E91E63; -@pink-600: #D21B59; -@pink-700: #BA184F; -@pink-800: #A31545; -@pink-900: #8C123B; -@pink-1000: #750F32; - -// orange -@orange-100: #FFE1B3; -@orange-200: #FFCC80; -@orange-300: #FFB74D; -@orange-400: #FFA726; -@orange-500: #FF9800; -@orange-600: #E68900; -@orange-700: #CC7A00; -@orange-800: #B36A00; -@orange-900: #995B00; -@orange-1000: #804C00; - -// yellow -@yellow-100: #FFFAC5; -@yellow-200: #FFF69E; -@yellow-300: #FFF276; -@yellow-400: #FFEE58; -@yellow-500: #FFEB3B; -@yellow-600: #E6D435; -@yellow-700: #CCBC2F; -@yellow-800: #B3A529; -@yellow-900: #998D23; -@yellow-1000: #80761E; - -// green -@green-100: #CAE8CB; -@green-200: #A6D8A8; -@green-300: #82C785; -@green-400: #67BB6A; -@green-500: #4CAF50; -@green-600: #449E48; -@green-700: #3D8C40; -@green-800: #357A38; -@green-900: #2E6930; -@green-1000: #265828; - -// cyan -@cyan-100: #B3EBF3; -@cyan-200: #80DEEA; -@cyan-300: #4DD1E1; -@cyan-400: #26C6DA; -@cyan-500: #00BCD4; -@cyan-600: #00A9BF; -@cyan-700: #0096AA; -@cyan-800: #008494; -@cyan-900: #00717F; -@cyan-1000: #005E6A; - -// blue -@blue-100: #BDE0FC; -@blue-200: #91CBFA; -@blue-300: #64B6F7; -@blue-400: #42A6F5; -@blue-500: #2196F3; -@blue-600: #1E87DB; -@blue-700: #1A78C2; -@blue-800: #1769AA; -@blue-900: #145A92; -@blue-1000: #114B7A; - -// indigo -@indigo-100: #C6CBE9; -@indigo-200: #A0A9DB; -@indigo-300: #7986CC; -@indigo-400: #5C6BC0; -@indigo-500: #3F51B5; -@indigo-600: #3949A3; -@indigo-700: #324191; -@indigo-800: #2C397F; -@indigo-900: #26316D; -@indigo-1000: #20295B; - -// purple -@purple-100: #E2BFE8; -@purple-200: #CE94D8; -@purple-300: #BA68C8; -@purple-400: #AB47BC; -@purple-500: #9C27B0; -@purple-600: #8C239E; -@purple-700: #7D1F8D; -@purple-800: #6D1B7B; -@purple-900: #5E176A; -@purple-1000: #4E1458; - -// brown -@brown-100: #D7CDC9; -@brown-200: #BDABA4; -@brown-300: #A2887F; -@brown-400: #8D6E63; -@brown-500: #795548; -@brown-600: #6D4D41; -@brown-700: #61443A; -@brown-800: #553B32; -@brown-900: #49332B; -@brown-1000: #3D2B24; - -// grey -@grey-100: #E2E2E2; -@grey-200: #CFCFCF; -@grey-300: #BCBCBC; -@grey-400: #ACACAC; -@grey-500: #9E9E9E; -@grey-600: #8E8E8E; -@grey-700: #7E7E7E; -@grey-800: #6F6F6F; -@grey-900: #5F5F5F; -@grey-1000: #4F4F4F; - -// blue-grey -@blue-grey-100: #D0D9DD; -@blue-grey-200: #B0BFC6; -@blue-grey-300: #90A5AE; -@blue-grey-400: #78909C; -@blue-grey-500: #607D8B; -@blue-grey-600: #56717D; -@blue-grey-700: #4D646F; -@blue-grey-800: #435861; -@blue-grey-900: #3A4B53; -@blue-grey-1000: #303F46; - -// dark -@dark-100: #707070; -@dark-200: #666666; -@dark-300: #5C5C5C; -@dark-400: #4A4A4A; -@dark-500: #404040; -@dark-600: #3A3A3A; -@dark-700: #303030; -@dark-800: #202020; -@dark-900: #161616; -@dark-1000: #0D0D0D; - -// white -@white: #ffffff; -@transparent: rgba(0,0,0,0); diff --git a/style/themes/default/custom.less b/style/themes/default/custom.less index 58ee71ffc6..42a5ee03d8 100644 --- a/style/themes/default/custom.less +++ b/style/themes/default/custom.less @@ -19,7 +19,7 @@ // LINK @link-color : #00abea; -@link-hover-color : fadeout(#00abea, 30%); +@link-hover-color : tint(#00abea, 30%); @link-hover-decoration : none; // Disabled cursor for form controls and buttons. @@ -50,8 +50,8 @@ @btn-font-weight : normal; @btn-primary-color : #fff; -@btn-primary-bg : #2db7f5; -@btn-primary-border : #2db7f5; +@btn-primary-bg : @primary-color; +@btn-primary-border : @primary-color; @btn-default-color : #666; @btn-default-bg : #f3f5f7; @@ -140,5 +140,5 @@ @input-font-size-sm : @font-size-base; @input-hover-border-color : #23c0fa; -@input-focus-border-color : #2db7f5; +@input-focus-border-color : @primary-color; @input-disabled-bg : #f3f5f7; diff --git a/style/themes/default/index.less b/style/themes/default/index.less index 21bc0dbba6..9266e1e6ab 100644 --- a/style/themes/default/index.less +++ b/style/themes/default/index.less @@ -1,2 +1 @@ -@import "color.less"; -@import "custom.less"; \ No newline at end of file +@import "custom.less";