diff options
author | Ed Tanous <ed.tanous@intel.com> | 2018-12-19 20:57:42 -0800 |
---|---|---|
committer | Ed Tanous <ed.tanous@intel.com> | 2018-12-21 20:25:50 +0000 |
commit | 86caba11821c4454e1949629ad3ad11d0326db6e (patch) | |
tree | e4313ae332682899b1ec8d8b91e8d841cc78ea9e /app/redfish | |
parent | fdb701d3f325748b98f5a8cd6946a11795635eca (diff) | |
download | phosphor-webui-86caba11821c4454e1949629ad3ad11d0326db6e.tar.gz phosphor-webui-86caba11821c4454e1949629ad3ad11d0326db6e.zip |
webui: Fix redfish to use proper styles
Redfish was using inline style tags, which is conflicting with our
desire to disable inline styles. This moves the redfish styles to an
appropriate SCSS file.
Tested by:
Launched redfish GUI, and observed no style differences
Change-Id: Ifb96730f0d6a34700f8c05666b6963a77d511911
Signed-off-by: Ed Tanous <ed.tanous@intel.com>
Diffstat (limited to 'app/redfish')
-rw-r--r-- | app/redfish/controllers/redfish-controller.html | 12 | ||||
-rw-r--r-- | app/redfish/styles/index.scss | 14 |
2 files changed, 20 insertions, 6 deletions
diff --git a/app/redfish/controllers/redfish-controller.html b/app/redfish/controllers/redfish-controller.html index ca7cb75..5eab9b3 100644 --- a/app/redfish/controllers/redfish-controller.html +++ b/app/redfish/controllers/redfish-controller.html @@ -1,13 +1,13 @@ <loader loading="loading"></loader> -<div id="redfish"> +<div id="redfish", class="redfish"> <div class="row column"> - <div style="max-width: 400px;margin:0"> + <div class="logo"> <img src="../../assets/images/DMTF_Redfish_logo_2017.svg"> </div> </div> <div class="row column"> { - <ul style="list-style: none;"> + <ul class="key_value"> <li ng-repeat="(key, value) in redfishData" ng-include="'recurse'"> </li> </ul> } @@ -17,7 +17,7 @@ "<b>{{key}}</b>": <span ng-if="isObject(value) && !isArray(value)"> { - <ul style="list-style: none;"> + <ul class="key_value"> <li ng-repeat="(key, value) in value" ng-include="'recurse'"> </li> </ul> } @@ -25,10 +25,10 @@ <span ng-if="isArray(value)"> [ - <div ng-repeat="val in value" style="margin-left: 2em;"> + <div ng-repeat="val in value" class="value"> <span ng-if="isObject(val) && !isArray(val)"> { - <ul style="list-style: none;"> + <ul class="key_value"> <li ng-repeat="(key, value) in val" ng-include="'recurse'"> </li> </ul> } diff --git a/app/redfish/styles/index.scss b/app/redfish/styles/index.scss new file mode 100644 index 0000000..0bfb29c --- /dev/null +++ b/app/redfish/styles/index.scss @@ -0,0 +1,14 @@ +.redfish { + .logo { + max-width: 400px; + margin: 0; + } + + .key_value { + list-style: none; + } + + .value { + margin-left: 2em; + } +} |