Move to Bootstrap 4
Bootstrap < 4.1.2 has the following CVE:
https://nvd.nist.gov/vuln/detail/CVE-2018-14041
Removed bootstrap-theme.css due to "Replaced the separate optional
theme with configurable options via SCSS variables
(e.g., $enable-gradients: true)."
Added "width: 100%" to a few places where width 100% was no longer
getting inherited.
Moved a few elements and adjusted styles to get the same look as
before.
See https://getbootstrap.com/docs/4.0/migration/ for more
information.
Tested: Manually on a Witherspoon.
Change-Id: I0a72665ac1ca6eacd0b553a585b1fb15e14ae62c
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 62bd831..7aadc11 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -21,15 +21,10 @@
</div>
</div>
</section>
- <!-- Filters -->
- <section class="row column">
- <!-- search -->
- <log-search-control></log-search-control>
- <!-- filters -->
- <log-filter></log-filter>
- </section>
- <!-- end filter -->
-
+ <!-- search -->
+ <log-search-control></log-search-control>
+ <!-- filters -->
+ <log-filter></log-filter>
<section id="event-log__events" class="row column">
<div id="event__actions-bar" class="row header__actions-bar no-margin">
<div class="column small-1 large-1 event-log__col-check">
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index 17030ba..5d510aa 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -19,8 +19,8 @@
<button class="clear-input" ng-click="clear()">✕</button>
<input id="content__search-submit" type="submit" class="btn btn-primary content__search-submit" value="Filter" ng-click="doSearchOnClick()"/>
</div>
+ </div> <!-- end search -->
- </div>
<div class="toggle-filter">
<p class="content-label">FILTER BY SEVERITY</p>
<button class="inline first btn-primary" ng-click="toggleSeverityAll()"
@@ -37,7 +37,7 @@
</button>
</div>
- </section> <!-- end search -->
+ </section>
<section class="row column" ng-show="filteredSensorData.length == 0">
<!-- message -->
@@ -69,4 +69,4 @@
<p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
</div>
</section>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/server-health/styles/inventory.scss b/app/server-health/styles/inventory.scss
index 42de893..cf6f2b4 100644
--- a/app/server-health/styles/inventory.scss
+++ b/app/server-health/styles/inventory.scss
@@ -23,6 +23,7 @@
text-decoration: none;
border-left: 1px solid $medgrey;
border-right: 1px solid $medgrey;
+ width: 100%;
border-bottom: 0;
vertical-align: middle;
@include fastTransition-all;
diff --git a/app/server-health/styles/log.scss b/app/server-health/styles/log.scss
index 50c19b6..6096acb 100644
--- a/app/server-health/styles/log.scss
+++ b/app/server-health/styles/log.scss
@@ -1,6 +1,9 @@
// Event Log SCSS
#event-log {
+ .row {
+ width: 100%;
+ }
// Dropwdowns filter
.dropdown__date.row {
padding: .5em;
@@ -268,7 +271,7 @@
font-weight: 400;
margin-left: 1em;
@include mediaQuery(small) {
- margin-left: 4.5em;
+ margin-left: 1.5em;
margin-right: 1em;
}
word-break: break-all;
diff --git a/app/server-health/styles/sensors.scss b/app/server-health/styles/sensors.scss
index fa44a46..a2246d7 100644
--- a/app/server-health/styles/sensors.scss
+++ b/app/server-health/styles/sensors.scss
@@ -51,6 +51,7 @@
}
.sensor__readings-row {
+ width: 100%;
position: relative;
display: block;
margin: 0;
@@ -137,15 +138,9 @@
#sensors, #sensors-overview {
- .content__search {
- max-width: 100%;
- @media(min-width: 1300px) {
- max-width: 59%;
- }
- }
.toggle-filter {
margin-right: 0;
}
}
-//end sensor details
\ No newline at end of file
+//end sensor details