extended disabled status indicator to use "off" icon
Change-Id: If46c5dfa5656948747cbf4f2faacab9244f8e40c
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
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 f5f4c61..5a95e64 100644
--- a/app/common/services/dataService.js
+++ b/app/common/services/dataService.js
@@ -14,7 +14,7 @@
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 37aaf46..bf3c981 100644
--- a/app/common/styles/base/core.scss
+++ b/app/common/styles/base/core.scss
@@ -33,7 +33,7 @@
}
}
-a {
+a, button.link {
color: $links;
&:visited {
color: $links__visited;
@@ -44,4 +44,9 @@
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 @@
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 @@
[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/base/utility.scss b/app/common/styles/base/utility.scss
index 2886bf1..624d487 100644
--- a/app/common/styles/base/utility.scss
+++ b/app/common/styles/base/utility.scss
@@ -5,6 +5,11 @@
.disabled {
color: $lightbg__grey;
+ @include fastTransition-all;
+ &:hover {
+ cursor: default;
+ text-decoration: none;
+ }
}
.float-right {
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/elements/toggle-filter.scss b/app/common/styles/elements/toggle-filter.scss
index 7305414..6dd7e77 100644
--- a/app/common/styles/elements/toggle-filter.scss
+++ b/app/common/styles/elements/toggle-filter.scss
@@ -24,7 +24,6 @@
font-weight: 700;
border-radius: 0;
display: inline-block;
- border-left: 0;
&.first,
&.last {
border-radius: 3px;