Various minor changes
- Add style class for critical icon
- Minor tweaks to content styles
- Reorder event log content for responsiveness
Change-Id: Ibbe769a9c23d288db6b8e9db1a41b25d7b060999
Signed-off-by: Michael Davis <michael.s.davis@ibm.com>
diff --git a/app/server-health/controllers/inventory-controller.html b/app/server-health/controllers/inventory-controller.html
index 2941aaa..d674efb 100644
--- a/app/server-health/controllers/inventory-controller.html
+++ b/app/server-health/controllers/inventory-controller.html
@@ -58,8 +58,7 @@
ng-class="{'active': inventory__metadatarow, 'selected': inventory__selected}">
<div class="row column" ng-click="inventory__metadatarow = ! inventory__metadatarow">
<div class="column small-12 large-3 inventory__info">
- <p class="priority-tag-circ high-priority" aria-label="High Priority"></p>
- <p class="inventory__title">CPU core 5</p>
+ <p class="overview__title">CPU core 5</p>
</div>
<div class="column small-12 large-3">
<p class="content-label">Part Number</p>
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 6646845..f8c08da 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -28,11 +28,11 @@
<log-filter></log-filter>
</section> <!-- end filter -->
<section id="event-log__events" class="row column">
- <div id="event__actions-bar" class="row header__actions-bar ">
+ <div id="event__actions-bar" class="row header__actions-bar no-margin">
<div class="column small-1 large-1 event-log__col-check">
<label class="control-check">
<input type="checkbox" name="events__check-all" ng-model="all" ng-checked="(logs|filter:{selected: true}).length == logs.length"/>
- <div class="control__indicator"></div>
+ <span class="control__indicator"></span>
</label>
</div>
<div class="column small-11 large-11 end col-logged-events">
@@ -60,9 +60,9 @@
</div>
</div>
</div>
- <log-event
- dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms))| itemsPerPage: itemsPerPage"
- event="event"
+ <log-event
+ dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms))| itemsPerPage: itemsPerPage"
+ event="event"
tmz="tmz">
</log-event>
</section>
diff --git a/app/server-health/controllers/sensors-controller.html b/app/server-health/controllers/sensors-controller.html
index 15cd997..5b1d872 100644
--- a/app/server-health/controllers/sensors-controller.html
+++ b/app/server-health/controllers/sensors-controller.html
@@ -81,6 +81,5 @@
</div>
</div>
</div>
-
</section>
</div> <!-- end event log -->
diff --git a/app/server-health/styles/log.scss b/app/server-health/styles/log.scss
index adecf92..3de7796 100644
--- a/app/server-health/styles/log.scss
+++ b/app/server-health/styles/log.scss
@@ -106,7 +106,8 @@
padding-right: 0;
}
-#event-log__events {
+#event-log__events,
+.event-log__events {
display: block;
margin-top: 1.6em;
position: relative;
@@ -185,8 +186,10 @@
// Single event log card
.event-log__single-event {
- border-top: 1px solid $medgrey;
+ border: 1px solid $medgrey;
padding: 1em 1em 1em .7em;
+ margin: .5em 0 .5em 0;
+ position: relative;
}
.event-log__event-info {
&:hover {
@@ -227,8 +230,10 @@
text-transform: uppercase;
color: $darkgrey;
font-weight: 700;
- margin: 0 1em;
min-width: 103px;
+ @include mediaQuery(medium) {
+ margin: 0 1em;
+ }
}
//Event description
@@ -241,13 +246,16 @@
@include fontCourierBold;
font-size: .9em;
color: $darkgrey;
+ margin-right: 1em;
}
.event__timestamp {
@include fontCourierBold;
font-size: .9em;
color: #999999;
- margin-left: 1.2em;
+ @media (min-width: 1105px ) {
+ float: right;
+ }
}
// Event metadata row