style updates for header and power-ops
Change-Id: I5f518dd983d8ff4220062f4c31f0d9bd4f09b6f1
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/src/header.html b/src/header.html
index 561cb7c..7c14f2f 100644
--- a/src/header.html
+++ b/src/header.html
@@ -1,11 +1,17 @@
+<!-- HEADER -->
+<!-- Class of status-light__good has 3 states: status-light__good, status-light__error, status-light__disabled -->
+<!-- Server Power buttton links to 'server power operations' page; Server Status may link to event log page. TBD.-->
+
<header id="header">
- <div class="logo__wrapper"></div>
- <span class="app__version">openBMC V.0.0.1</span>
- <div id="app-user" class="float-right">
- <span class="app-user__indicator inline"></span>
- <span class="app-user__name inline">SysAdmin</span>
- </div>
+ <span class="app__version float-left">openBMC V.0.0.1</span>
+ <a href="index.html" class="header__logout">Log out</a>
</header>
<div class="header__functions-wrapper">
- header functions here
+ <div class="logo__wrapper"></div>
+ <div class="header__functions">
+ <a href="">Server health<span class="status-light__error">Error</span></a>
+ <a href="power-operations.html" class="header__server-power">Server power<span class="status-light__good">On</span></a>
+ <p class="header__refresh">Page last refreshed <span>3:20:12 Feb 12 2017</span></p>
+ <button class="header__page-refresh"><img src="img/icon-refresh-white.svg" /></button>
+ </div>
</div>
\ No newline at end of file
diff --git a/src/img/icon-refresh-white.svg b/src/img/icon-refresh-white.svg
new file mode 100644
index 0000000..1543cad
--- /dev/null
+++ b/src/img/icon-refresh-white.svg
@@ -0,0 +1 @@
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 52.18 51.91"><defs><style>.cls-1{fill:#fff;}</style></defs><title>icon-refresh-white</title><path class="cls-1" d="M38,20.77H52v-14H48.3v6.07A26,26,0,1,0,48.7,38H44.32a22.14,22.14,0,1,1,1.8-20.92H38v3.67Z" transform="translate(0.16 0.14)"/></svg>
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 8673391..f0c4d67 100644
--- a/src/index.html
+++ b/src/index.html
@@ -36,7 +36,7 @@
<label for="password">Password</label>
<input type="password" id="password" name="password" required>
- <input id="login__submit" type="submit" value="Log in" role="button">
+ <input id="login__submit" class="btn-primary" type="submit" value="Log in" role="button">
<p class="login__error-msg hide" role="alert">Invalid login attempt</p>
<!-- if login is invalid remove "hide" class to pop error -->
diff --git a/src/js/main.js b/src/js/main.js
index f50fe79..9c1437c 100755
--- a/src/js/main.js
+++ b/src/js/main.js
@@ -85,16 +85,9 @@
//Close all sub panels and remove opened class
parent.find('.nav__second-level').css("display", "none").removeClass('opened');
- //Open sub panels that matches clicked button and add opened class
+ // add opened class
parent.find(subnavClass).css("display", "block").addClass('opened');
- // var pgurl = window.location.href.substr(window.location.href.lastIndexOf("/")+1);
- //
- // $('.nav__second-level a').each(function(){
- // console.log(pgurl);
- // if($(this).attr("href") == pgurl || $(this).attr("href") == '' )
- // $('.nav__second-level li').addClass("active");
- // })
});
}
diff --git a/src/navigation.html b/src/navigation.html
index c715c96..1ebc768 100644
--- a/src/navigation.html
+++ b/src/navigation.html
@@ -1,7 +1,7 @@
<nav role="navigation">
<ul id="nav__top-level">
<li>
- <button class="btn-dashboard opened">
+ <button class="btn-overview opened">
<svg version="1.1" class="nav__icon" x="0px" y="0px"
viewBox="0 0 20 20">
<g>
@@ -18,21 +18,21 @@
</g>
</svg>
- <p>Dashboard</p></button>
+ <span class="">Overview</span></button>
</li>
<li>
<button class="btn-settings">
<svg class="nav__icon" viewBox="0 0 20 20">
<path d="M17.498,11.697c-0.453-0.453-0.704-1.055-0.704-1.697c0-0.642,0.251-1.244,0.704-1.697c0.069-0.071,0.15-0.141,0.257-0.22c0.127-0.097,0.181-0.262,0.137-0.417c-0.164-0.558-0.388-1.093-0.662-1.597c-0.075-0.141-0.231-0.22-0.391-0.199c-0.13,0.02-0.238,0.027-0.336,0.027c-1.325,0-2.401-1.076-2.401-2.4c0-0.099,0.008-0.207,0.027-0.336c0.021-0.158-0.059-0.316-0.199-0.391c-0.503-0.274-1.039-0.498-1.597-0.662c-0.154-0.044-0.32,0.01-0.416,0.137c-0.079,0.106-0.148,0.188-0.22,0.257C11.244,2.956,10.643,3.207,10,3.207c-0.642,0-1.244-0.25-1.697-0.704c-0.071-0.069-0.141-0.15-0.22-0.257C7.987,2.119,7.821,2.065,7.667,2.109C7.109,2.275,6.571,2.497,6.07,2.771C5.929,2.846,5.85,3.004,5.871,3.162c0.02,0.129,0.027,0.237,0.027,0.336c0,1.325-1.076,2.4-2.401,2.4c-0.098,0-0.206-0.007-0.335-0.027C3.001,5.851,2.845,5.929,2.77,6.07C2.496,6.572,2.274,7.109,2.108,7.667c-0.044,0.154,0.01,0.32,0.137,0.417c0.106,0.079,0.187,0.148,0.256,0.22c0.938,0.936,0.938,2.458,0,3.394c-0.069,0.072-0.15,0.141-0.256,0.221c-0.127,0.096-0.181,0.262-0.137,0.416c0.166,0.557,0.388,1.096,0.662,1.596c0.075,0.143,0.231,0.221,0.392,0.199c0.129-0.02,0.237-0.027,0.335-0.027c1.325,0,2.401,1.076,2.401,2.402c0,0.098-0.007,0.205-0.027,0.334C5.85,16.996,5.929,17.154,6.07,17.23c0.501,0.273,1.04,0.496,1.597,0.66c0.154,0.047,0.32-0.008,0.417-0.137c0.079-0.105,0.148-0.186,0.22-0.256c0.454-0.453,1.055-0.703,1.697-0.703c0.643,0,1.244,0.25,1.697,0.703c0.071,0.07,0.141,0.15,0.22,0.256c0.073,0.098,0.188,0.152,0.307,0.152c0.036,0,0.073-0.004,0.109-0.016c0.558-0.164,1.096-0.387,1.597-0.66c0.141-0.076,0.22-0.234,0.199-0.393c-0.02-0.129-0.027-0.236-0.027-0.334c0-1.326,1.076-2.402,2.401-2.402c0.098,0,0.206,0.008,0.336,0.027c0.159,0.021,0.315-0.057,0.391-0.199c0.274-0.5,0.496-1.039,0.662-1.596c0.044-0.154-0.01-0.32-0.137-0.416C17.648,11.838,17.567,11.77,17.498,11.697 M16.671,13.334c-0.059-0.002-0.114-0.002-0.168-0.002c-1.749,0-3.173,1.422-3.173,3.172c0,0.053,0.002,0.109,0.004,0.166c-0.312,0.158-0.64,0.295-0.976,0.406c-0.039-0.045-0.077-0.086-0.115-0.123c-0.601-0.6-1.396-0.93-2.243-0.93s-1.643,0.33-2.243,0.93c-0.039,0.037-0.077,0.078-0.116,0.123c-0.336-0.111-0.664-0.248-0.976-0.406c0.002-0.057,0.004-0.113,0.004-0.166c0-1.75-1.423-3.172-3.172-3.172c-0.054,0-0.11,0-0.168,0.002c-0.158-0.312-0.293-0.639-0.405-0.975c0.044-0.039,0.085-0.078,0.124-0.115c1.236-1.236,1.236-3.25,0-4.486C3.009,7.719,2.969,7.68,2.924,7.642c0.112-0.336,0.247-0.664,0.405-0.976C3.387,6.668,3.443,6.67,3.497,6.67c1.75,0,3.172-1.423,3.172-3.172c0-0.054-0.002-0.11-0.004-0.168c0.312-0.158,0.64-0.293,0.976-0.405C7.68,2.969,7.719,3.01,7.757,3.048c0.6,0.6,1.396,0.93,2.243,0.93s1.643-0.33,2.243-0.93c0.038-0.039,0.076-0.079,0.115-0.123c0.336,0.112,0.663,0.247,0.976,0.405c-0.002,0.058-0.004,0.114-0.004,0.168c0,1.749,1.424,3.172,3.173,3.172c0.054,0,0.109-0.002,0.168-0.004c0.158,0.312,0.293,0.64,0.405,0.976c-0.045,0.038-0.086,0.077-0.124,0.116c-0.6,0.6-0.93,1.396-0.93,2.242c0,0.847,0.33,1.645,0.93,2.244c0.038,0.037,0.079,0.076,0.124,0.115C16.964,12.695,16.829,13.021,16.671,13.334 M10,5.417c-2.528,0-4.584,2.056-4.584,4.583c0,2.529,2.056,4.584,4.584,4.584s4.584-2.055,4.584-4.584C14.584,7.472,12.528,5.417,10,5.417 M10,13.812c-2.102,0-3.812-1.709-3.812-3.812c0-2.102,1.71-3.812,3.812-3.812c2.102,0,3.812,1.71,3.812,3.812C13.812,12.104,12.102,13.812,10,13.812"></path>
</svg>
- <p>Settings</p></button>
+ <span>Settings</span></button>
</li>
<li>
<button class="btn-multi">
<svg class="nav__icon" viewBox="0 0 20 20">
<path d="M10,1.529c-4.679,0-8.471,3.792-8.471,8.471c0,4.68,3.792,8.471,8.471,8.471c4.68,0,8.471-3.791,8.471-8.471C18.471,5.321,14.68,1.529,10,1.529 M10,17.579c-4.18,0-7.579-3.399-7.579-7.579S5.82,2.421,10,2.421S17.579,5.82,17.579,10S14.18,17.579,10,17.579 M14.348,10c0,0.245-0.201,0.446-0.446,0.446h-5c-0.246,0-0.446-0.201-0.446-0.446s0.2-0.446,0.446-0.446h5C14.146,9.554,14.348,9.755,14.348,10 M14.348,12.675c0,0.245-0.201,0.446-0.446,0.446h-5c-0.246,0-0.446-0.201-0.446-0.446s0.2-0.445,0.446-0.445h5C14.146,12.229,14.348,12.43,14.348,12.675 M7.394,10c0,0.245-0.2,0.446-0.446,0.446H6.099c-0.245,0-0.446-0.201-0.446-0.446s0.201-0.446,0.446-0.446h0.849C7.194,9.554,7.394,9.755,7.394,10 M7.394,12.675c0,0.245-0.2,0.446-0.446,0.446H6.099c-0.245,0-0.446-0.201-0.446-0.446s0.201-0.445,0.446-0.445h0.849C7.194,12.229,7.394,12.43,7.394,12.675 M14.348,7.325c0,0.246-0.201,0.446-0.446,0.446h-5c-0.246,0-0.446-0.2-0.446-0.446c0-0.245,0.2-0.446,0.446-0.446h5C14.146,6.879,14.348,7.08,14.348,7.325 M7.394,7.325c0,0.246-0.2,0.446-0.446,0.446H6.099c-0.245,0-0.446-0.2-0.446-0.446c0-0.245,0.201-0.446,0.446-0.446h0.849C7.194,6.879,7.394,7.08,7.394,7.325"></path>
</svg>
- <p>Multi System</p></button>
+ <span>Multi System</span></button>
</li>
<li>
<button class="btn-help">
@@ -40,14 +40,14 @@
<path class="nav__icon-help__outer" d="M10,0.9c-5,0-9,4-9,9s4,9,9,9s9-4,9-9S14.9,0.9,10,0.9"/>
<path class="nav__icon-help__inner" d="M9.2,5.4V3.7h1.5v1.8H9.2z M9.2,16.1v-9h1.5v9H9.2z"/>
</svg>
- <p>Help</p></button>
+ <span>Help</span></button>
</li>
</ul>
- <ul class="nav__second-level btn-dashboard">
- <li><a href="">Server summary</a></li>
- <li><a href="">Remote console</a></li>
+ <ul class="nav__second-level btn-overview">
+ <li><a href="">System Overview</a></li>
+ <li class="active"><a href="power-operations.html">Server power operations</a></li>
<li><a href="">Power consumption</a></li>
- <li><a href="power-operations.html">Power operation</a></li>
+ <li><a href="">Remote console</a></li>
</ul>
<ul class="nav__second-level btn-settings">
<li><a href="">2nd level 4</a></li>
diff --git a/src/power-operations.html b/src/power-operations.html
index 30445be..9ddbc70 100644
--- a/src/power-operations.html
+++ b/src/power-operations.html
@@ -21,29 +21,29 @@
<!-- Current status and bar display the state of the server. Class 'power__state-off' is applied to bar and 'power__state' text switches to say "off"-->
<div class="row column">
- <div class="power__current-status">
+ <div class="power__current-status ">
<p class="inline h4">Current status</p>
<span class="power__status-log inline float-right">Server last reset at 01:41:24 on 02/17/17</span>
</div>
</div>
<div class="row column">
- <div class="power__indicator-bar power__state-on">
+ <div id="power-indicator-bar" class="power__indicator-bar power__state-on">
<p class="inline">Server BLZ_109284.209.01</p>
<p class="power__state inline float-right h3"><span>On</span></p>
</div>
</div>
<div class="row column">
<div class="row column">
- <h3 class="h4">Select a power operation option</h3>
+ <h3 class="h4">Select a power operation</h3>
</div>
- <!-- Power on displays when/if server is shutdown -->
+ <!-- Power on displays only when server is shutdown -->
<div class="row column power-option">
<button id="power__power-on" class="btn-secondary">Power On</button>
<p>Attempts to power on the server</p>
</div>
- <!-- Power reboot/shutdown options : when server is off these get class 'disabled' and can not be interacted with -->
+ <!-- Power reboot/shutdown options : when server is off all of these are hidden. When one option is selected, the others are disabled. -->
<div class="row column power-option">
<button id="power__warm-boot" class="btn-secondary">Warm reboot</button>
<p>Attempts to perform an orderly shutdown before restarting the server</p>
@@ -91,7 +91,7 @@
$(this).parents('#power-operations').find('.power__confirm').addClass('active');
$(this).parents('#power-operations').find('.power-option').addClass('disabled');
$(this).parent().addClass('transitionAll').css("minHeight", msgheight).removeClass('disabled');
- $(this).parents('#power-operations').find('.power-option.disabled button').attr("disabled", true);
+ $(this).parents('#power-operations').find('.power-option.disabled button').attr("disabled", true).addClass('disabled');
});
$('.btn-primary').on('click', function(){
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;
}
}
