Event log: copy and UI fixes based on QA feedback
Change-Id: Ife1b7e691f5fcf023616b9151cff6598d346c2c4
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
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;
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index bb2fed6..ec533a1 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -40,7 +40,7 @@
<!-- top bar confirmation - ADD ACTIVE CLASS TO DISPLAY-->
<div class="inline__confirm event__confirm" ng-class="{active: confirm}">
<div class="inline__confirm-message">
- <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete {{selectedEvents.length}} logs</strong>?
+ <p class="h3"><i></i>Are you sure you want to <strong class="ng-binding">delete {{selectedEvents.length}} events</strong>?
</p>
</div>
<div class="inline__confirm-buttons">
diff --git a/app/server-health/styles/log.scss b/app/server-health/styles/log.scss
index 30d877c..b0c9cac 100644
--- a/app/server-health/styles/log.scss
+++ b/app/server-health/styles/log.scss
@@ -1,8 +1,6 @@
// Event Log SCSS
#event-log {
- .dropdown__button {
- }
// Dropwdowns filter
.dropdown__date.row {
padding: .5em;
@@ -35,10 +33,11 @@
margin-bottom: 3px;
}
.event__severity-filter {
+ float:left;
margin-right: 2em;
margin-bottom: 1em;
button {
- margin: 3px -3px;
+ margin: 0px -3px;
padding: .6em 2em;
min-height: 2.1em;
font-size: .9em;
@@ -61,6 +60,7 @@
.event__date-filter {
margin-right: 1.5em;
color: $darkgrey;
+ float:left;
input {
width: 170px;
height: 2.1rem;
@@ -71,6 +71,7 @@
}
}
.event__status-filter {
+ float:left;
@include mediaQuery(medium) {
width: 25%;
}
@@ -93,12 +94,6 @@
}
}
-// Event Log Events
-#event-log__events.row {
- padding-left: 0;
- padding-right: 0;
-}
-
.accord-trigger {
position: absolute;
right: 1em;
@@ -169,6 +164,10 @@
text-decoration: underline;
}
}
+ .btn-resolve.disabled:hover {
+ cursor: default;
+ text-decoration: none;
+ }
.btn-export {
margin-top: 7px;
padding-bottom: 0;