diff options
| author | Gunnar Mills <gmills@us.ibm.com> | 2018-11-14 13:44:41 -0600 |
|---|---|---|
| committer | Gunnar Mills <gmills@us.ibm.com> | 2018-11-15 15:46:11 -0600 |
| commit | 84e114a43065e2c20e87bd8a1a0dfb3ced896147 (patch) | |
| tree | bc334f4ba60b6bf9fcca5d1ed4e9bf4ee5e1abf5 /app/server-health/controllers | |
| parent | bc5cc7f75c4cb0c81200a2fcb2e68815b2b8c1b9 (diff) | |
| download | phosphor-webui-84e114a43065e2c20e87bd8a1a0dfb3ced896147.tar.gz phosphor-webui-84e114a43065e2c20e87bd8a1a0dfb3ced896147.zip | |
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>
Diffstat (limited to 'app/server-health/controllers')
| -rw-r--r-- | app/server-health/controllers/log-controller.html | 13 | ||||
| -rw-r--r-- | app/server-health/controllers/sensors-overview-controller.html | 6 |
2 files changed, 7 insertions, 12 deletions
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> |
