9:30 a.m.
The dropdown color is not related to Kimchi anymore. It is used for the
whole Wok application. So rename it from kimchi-dropdown to
wok-dropdown.
Add a specific color variable for modal flat widget and another one for
Wok matters.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
ui/css/src/modules/_buttons.scss | 4 ++--
ui/css/src/modules/_menu-flat.scss | 2 +-
ui/css/src/modules/_modal-flat.scss | 4 ++--
ui/css/src/modules/_wok-variables.scss | 4 +++-
ui/css/src/settings.scss | 4 ++--
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ui/css/src/modules/_buttons.scss b/ui/css/src/modules/_buttons.scss
index 34cee31..015ab23 100644
--- a/ui/css/src/modules/_buttons.scss
+++ b/ui/css/src/modules/_buttons.scss
@@ -45,10 +45,10 @@
}
.btn-group > span > .btn {
- @include button-variant($btn-primary-color, $kimchi-dropdown, $kimchi-dropdown);
+ @include button-variant($btn-primary-color, $wok-dropdown, $wok-dropdown);
font-weight: 700;
font-size: $font-size-btn;
- background: $kimchi-dropdown;
+ background: $wok-dropdown;
height: 40px;
padding: 4px 12px;
}
\ No newline at end of file
diff --git a/ui/css/src/modules/_menu-flat.scss b/ui/css/src/modules/_menu-flat.scss
index 0b0fa90..6a4e218 100644
--- a/ui/css/src/modules/_menu-flat.scss
+++ b/ui/css/src/modules/_menu-flat.scss
@@ -47,7 +47,7 @@
.menu-flat {
.btn {
- background: $kimchi-dropdown !important;
+ background: $wok-dropdown !important;
min-width: 160px;
border: 0 !important;
font-family: $font-family-bold;
diff --git a/ui/css/src/modules/_modal-flat.scss b/ui/css/src/modules/_modal-flat.scss
index 47806ca..120a5c9 100644
--- a/ui/css/src/modules/_modal-flat.scss
+++ b/ui/css/src/modules/_modal-flat.scss
@@ -130,7 +130,7 @@
text-align: left !important;
border-top: 0;
margin-top: 20px;
- background-color: map-get($colors, guests);
+ background-color: $modal-flat-color;
@include clearfix; // clear it in case folks use .pull-* classes on buttons
.btn {
@@ -224,7 +224,7 @@
.modal-body .nav-tabs > li.active > a, .modal-body .nav-tabs > li.active >
a:hover, .modal-body .nav-tabs > li.active > a:focus {
border: 0;
border-radius: 0;
- border-bottom: 5px solid map-get($colors, guests);
+ border-bottom: 5px solid $modal-flat-color;
font-weight: 600;
}
diff --git a/ui/css/src/modules/_wok-variables.scss
b/ui/css/src/modules/_wok-variables.scss
index ceefe56..bed2588 100644
--- a/ui/css/src/modules/_wok-variables.scss
+++ b/ui/css/src/modules/_wok-variables.scss
@@ -24,6 +24,8 @@ $bootstrap-sass-asset-helper: false !default;
$wok-logo: '../images/wok-logo.png';
$wok-icon-path: '../images/theme-default';
$icon-font-path: 'css/fontawesome/fontawesome-webfont.ttf';
+$modal-flat-color: #8cc63f;
+$wok-color: #d9182d;
//== Colors
//
@@ -42,8 +44,8 @@ $brand-success: #5cb85c !default;
$brand-info: #5bc0de !default;
$brand-warning: #f0ad4e !default;
$brand-danger: #d9534f !default;
-$kimchi-dropdown: #4d4c4e !default;
$storages-low: #8BC53E !default;
+$wok-dropdown: #4d4c4e !default;
$fa-green: #a8d46f !default;
$vnc-blue: #5ab3d4;
$toggle-checkbox-trigger-bg: #a7a7a8;
diff --git a/ui/css/src/settings.scss b/ui/css/src/settings.scss
index 19abf9d..557605e 100644
--- a/ui/css/src/settings.scss
+++ b/ui/css/src/settings.scss
@@ -35,12 +35,12 @@
.wok {
div.modal-footer {
- background-color: map-get($colors, wok);
+ background-color: $wok-color;
}
.modal-body .nav-tabs > li.active > a,
.modal-body .nav-tabs > li.active > a:hover,
.modal-body .nav-tabs > li.active > a:focus {
- border-color: -moz-use-text-color -moz-use-text-color map-get($colors, wok);
+ border-color: -moz-use-text-color -moz-use-text-color $wok-color;
}
&.modal {
--
2.7.4