summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Davis <michael.s.davis@ibm.com>2017-07-31 18:36:45 -0500
committerAdriana Kobylak <anoo@us.ibm.com>2017-10-09 13:46:35 -0500
commit7f89fad6454c71d14b0d84c691712faffc8e37f3 (patch)
tree73f3ae4f37d33c87c83c6c94f39dbd351eb09ae6
parentdc7479b97cfe27a367199ddec25e68792d6cdf23 (diff)
downloadphosphor-webui-7f89fad6454c71d14b0d84c691712faffc8e37f3.tar.gz
phosphor-webui-7f89fad6454c71d14b0d84c691712faffc8e37f3.zip
UI changes and fixes based on QA feedback
Change-Id: I13bae30e86330a8831d35f1d8a2f7da821324e37 Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
-rw-r--r--app/common/directives/firmware-list.html4
-rw-r--r--app/common/services/dataService.js2
-rw-r--r--app/common/styles/base/core.scss7
-rw-r--r--app/common/styles/base/foundation.scss6
-rw-r--r--app/common/styles/elements/inline-confirm.scss2
-rw-r--r--app/common/styles/layout/content.scss9
-rw-r--r--app/configuration/styles/firmware.scss6
-rw-r--r--app/server-control/controllers/power-operations-controller.html2
-rw-r--r--app/server-control/styles/power-operations.scss6
9 files changed, 22 insertions, 22 deletions
diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index 08cbffb..e243247 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -7,7 +7,7 @@
<div class="table__head">
<div class="table__row">
<div class="table__cell">
- Boot Priority
+ Boot priority
</div>
<div class="table__cell">
Image state
@@ -23,7 +23,7 @@
<div class="table__body">
<div class="table__row" ng-class="firmware.active ? 'firmware__primary' : ''" ng-repeat="firmware in firmwares|filter:filterBy">
<div class="table__cell">
- <span class="table__cell-label">Boot Priority:</span>
+ <span class="table__cell-label">Boot priority:</span>
<div class="icon icon__up-arrow icon-as-spacer" aria-hidden="true">
<span class="accessible-text">firmware down in priority</span></div>
<div class="icon icon__down-arrow" aria-hidden="true">
diff --git a/app/common/services/dataService.js b/app/common/services/dataService.js
index 4cb72c5..6863621 100644
--- a/app/common/services/dataService.js
+++ b/app/common/services/dataService.js
@@ -14,7 +14,7 @@ window.angular && (function (angular) {
angular
.module('app.common.services')
.service('dataService', ['Constants', function (Constants) {
- this.app_version = "openBMC V.0.0.1";
+ this.app_version = "V.0.0.1";
this.server_health = 'Error';
this.server_state = 'Unreachable';
this.server_status = -2;
diff --git a/app/common/styles/base/core.scss b/app/common/styles/base/core.scss
index 963dc9f..10ce9c3 100644
--- a/app/common/styles/base/core.scss
+++ b/app/common/styles/base/core.scss
@@ -11,7 +11,7 @@ p {
transition: margin .05s;
}
-a {
+a, button.link {
color: $links;
text-decoration: none;
font-weight: 700;
@@ -25,4 +25,9 @@ a {
:focus {
color: $links;
}
+}
+
+button.link {
+ padding-left: .3em;
+ padding-right: .3em;
} \ No newline at end of file
diff --git a/app/common/styles/base/foundation.scss b/app/common/styles/base/foundation.scss
index 36e18c2..f1bcb2f 100644
--- a/app/common/styles/base/foundation.scss
+++ b/app/common/styles/base/foundation.scss
@@ -525,7 +525,9 @@ textarea::-webkit-input-placeholder {
input::-moz-placeholder,
textarea::-moz-placeholder {
- color: #cacaca; }
+ color: #cacaca;
+ text-transform: lowercase;
+}
input:-ms-input-placeholder,
textarea:-ms-input-placeholder {
@@ -560,7 +562,7 @@ input[type='search'] {
[type='radio'] + label {
display: inline-block;
vertical-align: baseline;
- margin-left: 0.5rem;
+ //margin-left: 0.5rem;
margin-right: 1rem;
margin-bottom: 0; }
[type='checkbox'] + label[for],
diff --git a/app/common/styles/elements/inline-confirm.scss b/app/common/styles/elements/inline-confirm.scss
index 4746eb9..b01c576 100644
--- a/app/common/styles/elements/inline-confirm.scss
+++ b/app/common/styles/elements/inline-confirm.scss
@@ -6,7 +6,6 @@
transform: translateY(-103%);
width: 100%;
height: 100%;
- //margin-left: -1.8em;
z-index: 5;
background: $darkbg__primary;
color: $white;
@@ -45,6 +44,7 @@
// confirmation message
.inline__confirm-message {
display: inline-block;
+ font-weight: 400;
}
// Power confirmation message icon
diff --git a/app/common/styles/layout/content.scss b/app/common/styles/layout/content.scss
index b1a7942..5225284 100644
--- a/app/common/styles/layout/content.scss
+++ b/app/common/styles/layout/content.scss
@@ -8,9 +8,8 @@ $nav__seclvlWidth: 240px;
border-bottom: 1px solid $lightbg__grey;
margin: 1.625em 0 1.2em 0;
padding-left: 0;
- overflow: hidden;
.h4 {
- padding: 0;
+ padding: .1em 0 0 0;
margin: 0 0 .5em 0;
font-weight: bold;
}
@@ -21,16 +20,10 @@ $nav__seclvlWidth: 240px;
padding: 1em .1em;
transition: left 1s ease;
@include mediaQuery(x-small){
- //margin-left: $nav__toplvlWidth + $nav__seclvlWidth;
padding: 1rem 2rem;
}
}
-section.row {
- padding-left: 0;
- padding-right: 0;
-}
-
.content-header {
font-weight: 700;
margin-bottom: 0;
diff --git a/app/configuration/styles/firmware.scss b/app/configuration/styles/firmware.scss
index c634778..0b1664e 100644
--- a/app/configuration/styles/firmware.scss
+++ b/app/configuration/styles/firmware.scss
@@ -38,6 +38,9 @@
.table-header {
font-weight: 700;
+ p {
+ margin-bottom: 0em;
+ }
}
.table__row.disabled {
@@ -104,6 +107,9 @@
margin-top: 1.5em;
}
}
+.firmware__upload-file-name {
+ text-transform: none;
+}
.firmware__upload-chooser {
width: 100%;
background: $lightgrey;
diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html
index 38842a4..207bc1c 100644
--- a/app/server-control/controllers/power-operations-controller.html
+++ b/app/server-control/controllers/power-operations-controller.html
@@ -14,7 +14,7 @@
<div class="row column">
<div id="power-indicator-bar" class="power__indicator-bar" ng-class="{'power__state-on': dataService.server_state == 'Running', 'power__state-off': dataService.server_state == 'Off', 'power__state-indet': dataService.server_state == 'Quiesced'}">
<p class="inline">{{dataService.server_id}}</p>
- <h3 class="power__state inline float-right h3"><span>{{dataService.server_state}}</span></h3>
+ <h3 class="power__state inline no-margin h3"><span>{{dataService.server_state}}</span></h3>
</div>
</div>
<div class="row column">
diff --git a/app/server-control/styles/power-operations.scss b/app/server-control/styles/power-operations.scss
index c5b580f..616b89c 100644
--- a/app/server-control/styles/power-operations.scss
+++ b/app/server-control/styles/power-operations.scss
@@ -6,12 +6,6 @@
font-weight: bold;
}
- // Power op time stamp
- .power__status-log {
- color: $darkgrey;
- font-weight:500;
- }
-
// Power Curernt status wrapper
.power__current-status {
border-bottom: 1px solid $medgrey;
OpenPOWER on IntegriCloud