style updates for header and power-ops
Change-Id: I5f518dd983d8ff4220062f4c31f0d9bd4f09b6f1
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/src/scss/base/_buttons.scss b/src/scss/base/_buttons.scss
index 3703722..27a8466 100644
--- a/src/scss/base/_buttons.scss
+++ b/src/scss/base/_buttons.scss
@@ -5,18 +5,16 @@
border-radius: 3px;
padding: .8rem 3.5rem;
height: auto;
+ border: 0px;
&:hover {
cursor: pointer;
}
- &.disabled {
- border: 2px solid $lightgrey;
- color: $lightgrey;
- }
}
.disabled {
button, .button, input[type="submit"] {
opacity: 0.2;
+ color: $btn__disabled-txt;
&:hover {
cursor: default;
background: transparent;
@@ -27,6 +25,18 @@
.btn-primary {
color: $primebtn__text;
background: $primebtn__bg;
+ &:hover {
+ background: rgba(60,109,240,.8);
+ @include fastTransition-all;
+ }
+ &.disabled {
+ background: $btn__disabled-bg;
+ color: $btn__disabled-txt;
+ @include fastTransition-all;
+ &:hover {
+ cursor: default;
+ }
+ }
}
.btn-secondary {
color: $secbtn__text;
@@ -36,5 +46,14 @@
background: $lightbg__accent;
cursor: pointer;
background: $secbtn__bg;
+ @include fastTransition-all;
+ }
+ &.disabled {
+ border: 2px solid $lightgrey;
+ background: $btn__disabled-bg;
+ @include fastTransition-all;
+ &:hover {
+ background: $btn__disabled-bg;
+ }
}
}
diff --git a/src/scss/base/_colors.scss b/src/scss/base/_colors.scss
index c013e08..449bfb1 100644
--- a/src/scss/base/_colors.scss
+++ b/src/scss/base/_colors.scss
@@ -1,10 +1,11 @@
// Global
-$white: #fff;
+$white: #ffffff;
$black: #333;
$darkgrey: #666;
$lightgrey: #ccc;
$field__disabled: #F4F8F8;
-
+$btn__disabled-txt: #a6a5a6;
+$btn__disabled-bg: #d8d8d8;
// Dark background
$darkbg__grey: #E3ECEC;
@@ -26,6 +27,7 @@
$secbtn__border: #3f71ec;
$secbtn__text: #3f71ec;
+
// Alerts
$alert__error: rgba(230, 35, 37, 0.3);
$alert__warning: rgba(255, 127, 0, 0.3);
diff --git a/src/scss/base/_mixins.scss b/src/scss/base/_mixins.scss
index e26c10d..a259c6b 100644
--- a/src/scss/base/_mixins.scss
+++ b/src/scss/base/_mixins.scss
@@ -9,21 +9,15 @@
@media (min-width: 47.938em) { //767px
@content;
}
- }
-
- @else if $breakpoint == "medium" {
+ } @else if $breakpoint == "medium" {
@media (min-width: 64.000em) { //1024px
@content;
}
- }
-
- @else if $breakpoint == "large" {
+ } @else if $breakpoint == "large" {
@media (min-width: 85.375em) { //1366px
@content;
}
- }
-
- @else if $breakpoint == "x-large" {
+ } @else if $breakpoint == "x-large" {
@media (min-width: 100.000em) { //1600px
@content;
}
@@ -32,7 +26,7 @@
//Fonts mixin
@mixin fontFamily {
- font-family: Arial, Verdana, sans-serif;
+ font-family: Helvetica, Arial, Verdana, sans-serif;
font-weight: 200;
}
@@ -51,11 +45,35 @@
}
@mixin bgImage__arrowDown-accent {
- background-image:url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #3c6df0'></polygon></svg>");
+ background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #3c6df0'></polygon></svg>");
}
@mixin bgImage__arrowDown-grey {
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg' version='1.1' width='32' height='24' viewBox='0 0 32 24'><polygon points='0,0 32,0 16,24' style='fill: #b8c1c1'></polygon></svg>");
}
+@mixin status-light {
+ content: '\25CF';
+ display: inline-block;
+ font-size: 1.4em;
+ color: $status-ok;
+ margin-right: .3em;
+}
+@mixin status-light__good {
+ @include status-light;
+ color: $status-ok;
+
+}
+
+@mixin status-light__error {
+ @include status-light;
+ color: $error-color;
+
+}
+
+@mixin status-light__disabled {
+ @include status-light;
+ color: $darkgrey;
+
+}
diff --git a/src/scss/base/_utility.scss b/src/scss/base/_utility.scss
index 3d5a8ce..cedac11 100644
--- a/src/scss/base/_utility.scss
+++ b/src/scss/base/_utility.scss
@@ -42,6 +42,12 @@
}
}
+.fixed {
+ position:fixed;
+ top:130px;
+ z-index:200;
+}
+
.no-margin {
margin: 0px !important;
}
diff --git a/src/scss/components/_login.scss b/src/scss/components/_login.scss
index f5d73d8..0485dbd 100644
--- a/src/scss/components/_login.scss
+++ b/src/scss/components/_login.scss
@@ -26,7 +26,7 @@
#login__form {
color: $black;
- background: $white;
+ background: transparent;
padding: 1em 0;
display: block;
overflow: hidden;
diff --git a/src/scss/components/_power-ops.scss b/src/scss/components/_power-ops.scss
index 1d4d2d8..a5cc1f8 100644
--- a/src/scss/components/_power-ops.scss
+++ b/src/scss/components/_power-ops.scss
@@ -14,7 +14,7 @@
// Power Curernt status wrapper
.power__current-status {
border-bottom: 1px solid $lightbg__grey;
- margin: 3.625em 0 1.2em 0;
+ margin: 2.625em 0 1.2em 0;
.h4 {
padding: 0;
margin: 0 0 .5em 0;
@@ -93,6 +93,7 @@
}
&.disabled {
@include fastTransition-all;
+ p {opacity: .4;}
}
}
}
diff --git a/src/scss/layout/_content.scss b/src/scss/layout/_content.scss
index 5c690c6..3d80960 100644
--- a/src/scss/layout/_content.scss
+++ b/src/scss/layout/_content.scss
@@ -1,10 +1,11 @@
// Content layout styles
.content__container {
- padding-top: 3.75em;
margin-left: $nav__toplvlWidth;
+ padding: 1em .1em;
@include fastTransition-all;
- @include mediaQuery(medium){
+ @include mediaQuery(x-small){
margin-left: $nav__toplvlWidth + $nav__seclvlWidth;
+ padding: 1rem 2rem;
}
}
diff --git a/src/scss/layout/_header.scss b/src/scss/layout/_header.scss
index b86fcd7..f0431ca 100644
--- a/src/scss/layout/_header.scss
+++ b/src/scss/layout/_header.scss
@@ -1,15 +1,15 @@
-
-$logoHeight: 40px;
+$logoHeight: 30px;
$logoMaxHeight: 100px;
$logoMaxWidth: 125px;
#header__wrapper {
position: fixed;
- top:0;
+ top: 0;
left: 0;
- right:0;
+ right: 0;
z-index: 100;
}
+
.app__version {
margin-left: 1em;
display: none;
@@ -20,32 +20,111 @@
transform: translateY(-50%);
}
}
+
header {
position: relative;
- background: $lightbg__primary;
+ background: #000;
color: $white;
- padding: .8em;
+ overflow: hidden;
+}
+.header__logout {
+ float: right;
+ display: inline-block;
+ color: $white;
+ font-size: .9em;
+ text-decoration: none;
+ padding: 1em;
+ &:visited {
+ color: $white;
+ }
+}
+
+.header__functions-wrapper {
+ color: $white;
+ background: $lightbg__primary;
+ padding: 0 1.1em;
+ box-sizing: border-box;
+ display: block;
+ position: relative;
+ overflow: hidden;
+ min-height: 5em;
.logo__wrapper {
- display: inline-block;
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
}
#header__logo {
vertical-align: middle;
- margin-right: 1em;
+ margin: 1em;
float: left;
- height:$logoHeight; //required for <SVG> logos - can remove if using img
+ height: $logoHeight; //required for <SVG> logos - can remove if using img
max-height: $logoMaxHeight;
max-width: $logoMaxWidth;
width: auto;
}
-}
-
-.header__functions-wrapper {
- color: $white;
- background: green;
- padding: 1em 1.1em;
- box-sizing: border-box;
- display: block;
-}
+ .header__functions {
+ position: absolute;
+ top: 0;
+ right: 0;
+ bottom: 0;
+ background: $darkbg__primary;
+ span {
+ display: block;
+ color: $white;
+ font-size: 1em;
+ &.status-light__disabled {
+ color: $darkgrey;
+ &::before {
+ @include status-light__disabled;
+ }
+ }
+ &.status-light__good{
+ &::before {
+ @include status-light__good;
+ }
+ }
+ &.status-light__error{
+ color: $error-color;
+ &::before {
+ @include status-light__error;
+ }
+ }
+ }
+ a, p, button {
+ display: block;
+ float: left;
+ text-decoration: none;
+ border-left: 1px solid #384456;
+ color: $lightgrey;
+ margin: 0;
+ padding: 1.250em 1.688em;
+ height: 100%;
+ font-size: 0.875em;
+ line-height: 1.3;
+ > span {font-size: 1rem;
+ font-weight: bold;}
+ }
+ }
+ .header__functions {
+ .header__refresh {
+ color: $lightgrey;
+ line-height: 1.6;
+ }
+ }
+ .header__server-power,
+ .header__page-refresh{
+ &:hover {
+ background: rgba(60,109,240,.4);
+ }
+ }
+ .header__page-refresh {
+ img {
+ stroke: $white;
+ height: 22px;
+ width: 24px;
+ }
+ }
+}// end header__functions-wrapper
diff --git a/src/scss/layout/_navigation.scss b/src/scss/layout/_navigation.scss
index 0b07e5f..7a2d33c 100644
--- a/src/scss/layout/_navigation.scss
+++ b/src/scss/layout/_navigation.scss
@@ -39,10 +39,12 @@
a {
margin-bottom: 5px;
}
- p {
- margin: 0;
+ span {
+ margin: 1em 0 0 0;
+ display: block;
font-size: .9em;
- line-height: 1.2rem;
+ font-weight: normal;
+ line-height: 1rem;
}
.nav__icon-help__outer {
@@ -87,27 +89,29 @@
left: -$nav__toplvlWidth;
width: $nav__seclvlWidth;
z-index: 97;
- display: none;
padding: 0;
margin: 0;
+ display: none;
list-style-type: none;
transition: left .5s ease;
@include mediaQuery(medium) {
left: $nav__toplvlWidth;
}
- &.btn-dashboard {
+ &.btn-overview {
display: block;
}
&.opened {
left: $nav__toplvlWidth;
+ display: block;
@include fastTransition-all;
}
a {
- padding: 1.2em .6em 1.2em 1.9em;
+ padding: 1.2em .6em 1.2em 1em;
display: block;
color: $black;
text-decoration: none;
position: relative;
+ font-weight: 400;
}
li {
@@ -117,19 +121,19 @@
font-size: 2em;
font-weight: 700;
top: 50%;
- right: 2em;
+ right: .6em;
transform: translateY(-59%);
color: #4b5d78;
opacity: 0;
}
+ &.active {background: $white;}
&.active,
&:focus,
&:hover {
- background: $white;
- a {font-weight: bold; color: #4b5d78;}
+ a {color: #4b5d78;}
a:after {
opacity: 1;
- right: .5em;
+ right: .3em;
@include fastTransition-all;
}
}