From 318c9a56028e29fe1a3d0d63ec4df906863afa46 Mon Sep 17 00:00:00 2001 From: edward Date: Tue, 28 Nov 2017 13:06:45 +0800 Subject: [PATCH] less/roojs-bootstrap/calendar.less less/roojs-bootstrap/datepicker.less less/roojs-bootstrap/layout.less less/roojs-bootstrap/select2.less less/roojs-bootstrap/sidebar-nav.less less/roojs-bootstrap/table.less less/roojs-bootstrap/top-bar.less less/roojs-bootstrap/variables.less --- less/roojs-bootstrap/calendar.less | 4 ++-- less/roojs-bootstrap/datepicker.less | 16 ++++++++-------- less/roojs-bootstrap/layout.less | 4 ++-- less/roojs-bootstrap/select2.less | 22 +++++++++++----------- less/roojs-bootstrap/sidebar-nav.less | 6 +++--- less/roojs-bootstrap/table.less | 4 ++-- less/roojs-bootstrap/top-bar.less | 4 ++-- less/roojs-bootstrap/variables.less | 4 ++-- 8 files changed, 32 insertions(+), 32 deletions(-) diff --git a/less/roojs-bootstrap/calendar.less b/less/roojs-bootstrap/calendar.less index ce5a494df1..2affa07f4d 100644 --- a/less/roojs-bootstrap/calendar.less +++ b/less/roojs-bootstrap/calendar.less @@ -126,7 +126,7 @@ html .fc, .fc-widget-header, /* , usually */ .fc-widget-content { /* , usually */ - border: 1px solid @gray-lighter-86-5; + border: 1px solid @gray-light; } .fc-state-highlight { /* today cell */ /* TODO: add .fc-today to */ @@ -238,7 +238,7 @@ html .fc, .fc-state-down, .fc-state-active { - background-color: @gray-lighter-80; + background-color: @gray-light; background-image: none; outline: 0; box-shadow: inset 0 2px 4px @black-opacity-20, 0 1px 2px @black-opacity-20; diff --git a/less/roojs-bootstrap/datepicker.less b/less/roojs-bootstrap/datepicker.less index fc5868b151..ccd208ff9e 100644 --- a/less/roojs-bootstrap/datepicker.less +++ b/less/roojs-bootstrap/datepicker.less @@ -16,7 +16,7 @@ direction: ltr; font-size: 13px; /*.dow { - border-top: 1px solid @gray-lighter-86-5 !important; + border-top: 1px solid @gray-light !important; }*/ } @@ -38,7 +38,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-bottom: 7px solid @gray-lighter-80; + border-bottom: 7px solid @gray-light; border-bottom-color: @black-opacity-20; position: absolute; top: -7px; @@ -60,7 +60,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-bottom: 7px solid @gray-lighter-80; + border-bottom: 7px solid @gray-light; border-bottom-color: @black-opacity-20; position: absolute; top: -7px; @@ -81,7 +81,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-top: 7px solid @gray-lighter-80; + border-top: 7px solid @gray-light; border-bottom: 0; border-top-color: @black-opacity-20; position: absolute; @@ -106,7 +106,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-bottom: 7px solid @gray-lighter-80; + border-bottom: 7px solid @gray-light; border-bottom-color: @black-opacity-20; position: absolute; top: -7px; @@ -128,7 +128,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-bottom: 7px solid @gray-lighter-80; + border-bottom: 7px solid @gray-light; border-bottom-color: @black-opacity-20; position: absolute; top: -7px; @@ -150,7 +150,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-top: 7px solid @gray-lighter-80; + border-top: 7px solid @gray-light; border-top-color: @black-opacity-20; position: absolute; bottom: -7px; @@ -173,7 +173,7 @@ display: inline-block; border-left: 7px solid transparent; border-right: 7px solid transparent; - border-top: 7px solid @gray-lighter-80; + border-top: 7px solid @gray-light; border-top-color: @black-opacity-20; position: absolute; bottom: -7px; diff --git a/less/roojs-bootstrap/layout.less b/less/roojs-bootstrap/layout.less index 87d0a5156b..e40f8fbc0b 100644 --- a/less/roojs-bootstrap/layout.less +++ b/less/roojs-bootstrap/layout.less @@ -54,10 +54,10 @@ background-color:@well-bg; } .roo-layout-split-south, .roo-layout-split-north { - border-bottom : 1px solid @gray-lighter-86-5; + border-bottom : 1px solid @gray-light; } .roo-layout-split-east, .roo-layout-split-west { - border-right: 1px solid @gray-lighter-86-5; + border-right: 1px solid @gray-light; } diff --git a/less/roojs-bootstrap/select2.less b/less/roojs-bootstrap/select2.less index 4b91a8e15a..9f4bd085f2 100644 --- a/less/roojs-bootstrap/select2.less +++ b/less/roojs-bootstrap/select2.less @@ -188,12 +188,12 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014 background-clip: padding-box; - background: @gray-lighter-80; - background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, @gray-lighter-80), color-stop(0.6, @gray-lighter)); - background-image: -webkit-linear-gradient(center bottom, @gray-lighter-80 0%, @gray-lighter 60%); - background-image: -moz-linear-gradient(center bottom, @gray-lighter-80 0%, @gray-lighter 60%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '@gray-lighter', endColorstr = '@gray-lighter-80', GradientType = 0); - background-image: linear-gradient(to top, @gray-lighter-80 0%, @gray-lighter 60%); + background: @gray-light; + background-image: -webkit-gradient(linear, left bottom, left top, color-stop(0, @gray-light), color-stop(0.6, @gray-lighter)); + background-image: -webkit-linear-gradient(center bottom, @gray-light 0%, @gray-lighter 60%); + background-image: -moz-linear-gradient(center bottom, @gray-light 0%, @gray-lighter 60%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr = '@gray-lighter', endColorstr = '@gray-light', GradientType = 0); + background-image: linear-gradient(to top, @gray-light 0%, @gray-lighter 60%); } .roo-select2-container .roo-select2-choice .roo-select2-arrow b { @@ -419,7 +419,7 @@ disabled look for disabled choices in the results dropdown .roo-select2-container.roo-select2-container-disabled .roo-select2-choice { background-color: @gray-lighter-96-5; //#f4f4f4; background-image: none; - border: 1px solid @gray-lighter-86-5; + border: 1px solid @gray-light; cursor: default; } @@ -512,7 +512,7 @@ html[dir="rtl"] .roo-select2-container-multi .roo-select2-choices li line-height: 13px; color: @gray-dark; cursor: default; - border: 1px solid @gray-lighter-80; + border: 1px solid @gray-light; border-radius: 3px; -webkit-touch-callout: none; @@ -532,7 +532,7 @@ html[dir="rtl"] .roo-select2-container-multi .roo-select2-choices .roo-select2-s cursor: default; } .roo-select2-container-multi .roo-select2-choices .roo-select2-search-choice-focus { - background: @gray-lighter-86-5; //#d4d4d4; + background: @gray-light; //#d4d4d4; } .roo-select2-search-choice-close { @@ -567,13 +567,13 @@ html[dir="rtl"] .roo-select2-search-choice-close { .roo-select2-container-multi.roo-select2-container-disabled .roo-select2-choices { background-color: @gray-lighter-90; //#f4f4f4; background-image: none; - border: 1px solid @gray-lighter-86-5; + border: 1px solid @gray-light; cursor: default; } .roo-select2-container-multi.roo-select2-container-disabled .roo-select2-choices .roo-select2-search-choice { padding: 3px 5px 3px 5px; - border: 1px solid @gray-lighter-86-5; + border: 1px solid @gray-light; background-image: none; background-color: @gray-lighter-90; //#f4f4f4; } diff --git a/less/roojs-bootstrap/sidebar-nav.less b/less/roojs-bootstrap/sidebar-nav.less index 3a7727282a..b9593a3aea 100644 --- a/less/roojs-bootstrap/sidebar-nav.less +++ b/less/roojs-bootstrap/sidebar-nav.less @@ -19,12 +19,12 @@ { margin: 0; padding: 0; - border-bottom: 1px solid @gray-lighter-80; + border-bottom: 1px solid @gray-light; background-color: @gray-lighter; } /* active child menu - white BG */ .sidebar .sidebar-menu li.active li.treeview-menu { - background-color: @gray-lighter-86-5; + background-color: @gray-light; } .sidebar .sidebar-menu > li > a , @@ -91,7 +91,7 @@ } .sidebar .sidebar-menu li.disabled a { - color: @gray-lighter-80; + color: @gray-light; cursor: default; } diff --git a/less/roojs-bootstrap/table.less b/less/roojs-bootstrap/table.less index 10f09aae45..a7d89e7aa9 100644 --- a/less/roojs-bootstrap/table.less +++ b/less/roojs-bootstrap/table.less @@ -25,14 +25,14 @@ } .skin-blue .navbar .pagination > li > a:hover { - background-color: @gray-lighter-86-5; + background-color: @gray-light; } .skin-blue table .navbar { background-color: @body-bg; } .skin-blue .navbar .pagination>li.disabled >a{ - background-color: @gray-lighter-86-5; + background-color: @gray-light; } .skin-blue table .navbar { margin-bottom: 0; diff --git a/less/roojs-bootstrap/top-bar.less b/less/roojs-bootstrap/top-bar.less index 2da36a1ee6..849c666b0f 100644 --- a/less/roojs-bootstrap/top-bar.less +++ b/less/roojs-bootstrap/top-bar.less @@ -37,11 +37,11 @@ .footer .social li:last-child, .footer .social { margin-right: 0 !important } -.header .social li:first-child { border-left: 1px solid @gray-lighter-86-5 } +.header .social li:first-child { border-left: 1px solid @gray-light } .header .social li, .footer .social li { - border-right: 1px solid @gray-lighter-86-5; + border-right: 1px solid @gray-light; display: table-cell; vertical-align: middle; height: 40px; diff --git a/less/roojs-bootstrap/variables.less b/less/roojs-bootstrap/variables.less index 1355f74d9d..042468e01c 100644 --- a/less/roojs-bootstrap/variables.less +++ b/less/roojs-bootstrap/variables.less @@ -4,8 +4,8 @@ @black-opacity-80: fade(@gray-base, 80%); @gray-light: lighten(@gray-base, 75%); // #bfbfbf -@gray-lighter-80: lighten(@gray-base, 80%); // #cccccc -@gray-lighter-86-5: lighten(@gray-base, 86.5%); // #dddddd +@gray-light: lighten(@gray-base, 80%); // #cccccc +@gray-light: lighten(@gray-base, 86.5%); // #dddddd @gray-lighter-90: lighten(@gray-base, 90%); // #e6e6e6 @gray-lighter-96-5: lighten(@gray-base, 96.5%); // #f6f6f6 -- 2.39.2