[Kimchi-devel] [PATCH] [Kimchi 2/2] Wok issue #173: Set tab color on tab-ext.xml and update SCSS files
Aline Manera
alinefm at linux.vnet.ibm.com
Wed Oct 26 14:34:38 UTC 2016
Move Kimchi specific SCSS configuration from Wok to Kimchi source code.
Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
ui/config/tab-ext.xml | 2 +-
ui/css/src/kimchi.scss | 31 +++++++++++++++++++++----------
ui/css/src/modules/_edit-guests.scss | 2 +-
ui/css/src/modules/_guests.scss | 6 +++---
ui/css/src/modules/_iso-list.scss | 2 +-
ui/css/src/modules/_storage.scss | 4 ++--
6 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/ui/config/tab-ext.xml b/ui/config/tab-ext.xml
index 5729537..4c761a0 100644
--- a/ui/config/tab-ext.xml
+++ b/ui/config/tab-ext.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<tabs-ext>
- <functionality>Virtualization</functionality>
+ <functionality colorTab1="#59930c" colorTab2="#8cc63f">Virtualization</functionality>
<tab>
<access role="admin" mode="admin"/>
<access role="user" mode="byInstance"/>
diff --git a/ui/css/src/kimchi.scss b/ui/css/src/kimchi.scss
index 89904e0..0d53901 100644
--- a/ui/css/src/kimchi.scss
+++ b/ui/css/src/kimchi.scss
@@ -16,28 +16,39 @@
* limitations under the License.
*/
-// Core variables
+//
+// Wok Variables
+// ----------------------------------------------------------------------------
@import "../../../../../../../ui/css/src/modules/wok-variables";
-// Core functions
+
+//
+// Imported functions
+// ----------------------------------------------------------------------------
@import "../../../../../../../ui/css/src/modules/compact";
-// Compass Mixins
@import "../../../../../../../ui/css/src/vendor/compass-mixins/lib/compass";
-// Bootstrap Mixins
@import "../../../../../../../ui/css/src/vendor/bootstrap-sass/bootstrap/mixins";
+//
// Extended classes
+// ----------------------------------------------------------------------------
@import "../../../../../../../ui/css/src/modules/utils";
@import "../../../../../../../ui/css/src/modules/animation";
-// Images List - Guests and Templates
+//
+// Kimchi variables and classes
+// ----------------------------------------------------------------------------
+$virtColor: #8cc63f;
+$storages-low: #8BC53E !default;
+
+$guestCharts: (
+ lightGray: #e6e7e8,
+ mediumGray: #bbbdbf,
+ darkGray: #929497
+);
+
@import "modules/iso-list";
-// Guests
@import "modules/guests";
-// Edit Guests
@import "modules/edit-guests";
-// Templates
@import "modules/templates";
-// Network
@import "modules/network";
-// Storage
@import "modules/storage";
diff --git a/ui/css/src/modules/_edit-guests.scss b/ui/css/src/modules/_edit-guests.scss
index 632d634..fb7a91c 100644
--- a/ui/css/src/modules/_edit-guests.scss
+++ b/ui/css/src/modules/_edit-guests.scss
@@ -117,7 +117,7 @@
.cell.column-pci-status {
width: 3.7%;
.fa {
- color: $guests-color;
+ color: $virtColor;
font-size: 24px;
}
}
diff --git a/ui/css/src/modules/_guests.scss b/ui/css/src/modules/_guests.scss
index 8175ddf..7893cb3 100644
--- a/ui/css/src/modules/_guests.scss
+++ b/ui/css/src/modules/_guests.scss
@@ -504,12 +504,12 @@
.wok-guest-gallery .wok-guest-list-body .wok-guest-list-item {
> span.column-processors {
> div > div.progress-bar.cpu-progress-bar {
- background-color: map-get($colors, wok);
+ background-color: #d9182d;
}
}
> span.column-memory {
> div > div.progress-bar.memory-progress-bar {
- background-color: map-get($colors, host);
+ background-color: #008abf;
}
}
> span.column-storage {
@@ -519,7 +519,7 @@
}
> span.column-network {
> div > div.progress-bar.network-progress-bar {
- background-color: map-get($colors, network);
+ background-color: #7f1c7d;
}
}
}
diff --git a/ui/css/src/modules/_iso-list.scss b/ui/css/src/modules/_iso-list.scss
index a2e50a9..22b51a2 100644
--- a/ui/css/src/modules/_iso-list.scss
+++ b/ui/css/src/modules/_iso-list.scss
@@ -37,7 +37,7 @@
}
label.box-iso-outer .iso-radio-hidden:checked + span.box-iso-border,
label.box-iso-outer .iso-checkbox-hidden:checked + span.box-iso-border {
- border-color: $guests-color;
+ border-color: $virtColor;
}
label.box-iso-outer .iso-radio-hidden:checked + span.box-iso-border > .box-iso-inner,
label.box-iso-outer .iso-checkbox-hidden:checked + span.box-iso-border > .box-iso-inner {
diff --git a/ui/css/src/modules/_storage.scss b/ui/css/src/modules/_storage.scss
index 2e15cbb..0ccc816 100644
--- a/ui/css/src/modules/_storage.scss
+++ b/ui/css/src/modules/_storage.scss
@@ -211,8 +211,8 @@
}
&.wok-datagrid .wok-datagrid-body > .wok-datagrid-row.selected .volume-box-border {
- border-color: $guests-color;
- border-color: rgba($guests-color,1);
+ border-color: $virtColor;
+ border-color: rgba($virtColor,1);
}
&.wok-datagrid .wok-datagrid-body > .wok-datagrid-row.selected .volume-box-inner {
--
2.7.4
More information about the Kimchi-devel
mailing list