summaryrefslogtreecommitdiff
path: root/web/css/libs
diff options
context:
space:
mode:
authorShevAbam <shevabam@gmail.com>2015-07-07 15:57:41 +0200
committerShevAbam <shevabam@gmail.com>2015-07-07 15:57:41 +0200
commit9970343fe5c8226f25234addc6b80836c092fe1f (patch)
treece8f029f3ce9251bd4c207a6427c356ad9042525 /web/css/libs
parentdd982cee0716e38e68bc42ffb24952b5675a5b19 (diff)
General : cleaning and optimizing CSS
General : responsive design General : reload button now spins when you reload block General : update jQuery plugin Knob to 1.2.11 General : optimizing security (config file esm.config.json is now in the conf/ folder with an htaccess) CPU : retrieves correctly CPU frequency for Raspberry Pi CPU : add CPU temperature (+ option to enable/disable) System : little correction for getting distro name Swap : fix if swap is disabled Services status : adds protocol TCP or UDP for checking service status Services status : new option to hide port number (see show_port in services section)
Diffstat (limited to 'web/css/libs')
-rw-r--r--web/css/libs/_classic-box.scss38
-rw-r--r--web/css/libs/_labels.scss23
2 files changed, 29 insertions, 32 deletions
diff --git a/web/css/libs/_classic-box.scss b/web/css/libs/_classic-box.scss
index bbc886d..80cdadc 100644
--- a/web/css/libs/_classic-box.scss
+++ b/web/css/libs/_classic-box.scss
@@ -1,28 +1,28 @@
@import "compass";
.box {
- background: $classic-box-background;
- box-shadow: 3px 3px 0 rgba($classic-box-border, .6);
+ background: map-get($classic-box, background);
+ box-shadow: 3px 3px 0 rgba(map-get($classic-box, border-color), .6);
margin-bottom: 15px;
- border: 1px solid $classic-box-border;
+ border: 1px solid map-get($classic-box, border-color);
padding: 2px;
.box-header {
- background-color: $classic-box-color;
- height: $classic-box-header-height;
+ background-color: map-get($classic-box, color);
+ height: map-get-deep($classic-box, header, height);
h1 {
- color: $classic-box-title-color;
+ color: map-get-deep($classic-box, header, color);
float: left;
- font-size: $classic-box-title-fontsize;
+ font-size: map-get-deep($classic-box, header, font-size);
font-weight: bold;
- line-height: $classic-box-header-height - 2px;
+ line-height: map-get-deep($classic-box, header, height) - 2px;
padding-left: 10px;
text-transform: uppercase;
/*text-shadow: rgba(0, 0, 0, 1) 0 1px 0;*/
&:first-letter {
- font-size: $classic-box-title-fontsize + 6px;
+ font-size: map-get-deep($classic-box, header, font-size) + 6px;
}
}
ul {
@@ -34,20 +34,20 @@
margin-left: -3px;
a {
- color: lighten($classic-box-title-color, 10%);
- font-size: $classic-box-title-fontsize + 6px;
- line-height: $classic-box-header-height;
+ color: lighten(map-get-deep($classic-box, header, color), 10%);
+ font-size: map-get-deep($classic-box, header, font-size) + 6px;
+ line-height: map-get-deep($classic-box, header, height);
padding: 4px 10px;
text-decoration: none;
&:hover:not(.disabled) {
- background: lighten($classic-box-color, 20%);
- color: $classic-box-color !important;
+ background: lighten(map-get($classic-box, color), 20%);
+ color: map-get($classic-box, color) !important;
}
&.disabled {
- opacity: .4;
+ /*opacity: .4;*/
&:hover {
cursor: default;
@@ -74,12 +74,16 @@
table a {
text-decoration: none;
- color: $classic-box-color;
+ color: map-get($classic-box, color);
&:hover {
- color: lighten($classic-box-color, 20%);
+ color: lighten(map-get($classic-box, color), 20%);
}
}
+
+ &.faded {
+ opacity: .4;
+ }
}
.box-footer {
diff --git a/web/css/libs/_labels.scss b/web/css/libs/_labels.scss
index 726cb7e..5136300 100644
--- a/web/css/libs/_labels.scss
+++ b/web/css/libs/_labels.scss
@@ -2,24 +2,17 @@
span.label {
padding: 1px 3px 2px;
- font-size: $label-font-size;
+ font-size: map-get($label, font-size);
font-weight: bold;
color: #fff;
text-transform: uppercase;
white-space: nowrap;
- background-color: $label-default;
- @include border-radius($label-border-radius);
-
- &.success {
- background-color: $label-success;
- }
- &.warning {
- background-color: $label-warning;
- }
- &.important, &.error {
- background-color: $label-important;
- }
- &.notice {
- background-color: $label-notice;
+ background-color: map-get-deep($label, types, default);
+ @include border-radius(map-get($label, border-radius));
+
+ @each $name, $color in map-get($label, types) {
+ &.#{""+$name+""} {
+ background-color: $color;
+ }
}
} \ No newline at end of file