summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2018-03-02 15:48:23 -0600
committerGunnar Mills <gmills@us.ibm.com>2018-03-05 11:49:46 -0600
commit5e01bbc7474a75492c45ba5aafc7105d004d36f1 (patch)
treef0f9f1012e86e3c90a0302cb616fda27ba47c6d8
parente7c5c52d2bf35fada17637b0d205bc2ccc6c2882 (diff)
downloadphosphor-webui-5e01bbc7474a75492c45ba5aafc7105d004d36f1.tar.gz
phosphor-webui-5e01bbc7474a75492c45ba5aafc7105d004d36f1.zip
Have the "action" table cell flex
Let the action table cell flex to fit 2 buttons, "Activate" and "Delete". This happens on a "Ready" image. Resolves openbmc/openbmc#2964 Tested: See both "Activate" and "Delete" on a "Ready" image. Change-Id: I1a91ed83f2f99983795baea9f59bbc0dd4749c0e Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
-rw-r--r--app/common/directives/firmware-list.html4
-rw-r--r--app/configuration/styles/firmware.scss6
2 files changed, 7 insertions, 3 deletions
diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index 2856eaa..375b63c 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -15,7 +15,7 @@
<div class="table__cell firmware__version">
Version
</div>
- <div class="table__cell">
+ <div class="table__cell firmware__action">
Action
</div>
</div>
@@ -55,7 +55,7 @@
<h5 class="bold">Extended version information</h5>
<p class="no-margin" ng-repeat="version in firmware.extended.versions">{{version.title}}: {{version.version}}</p>
</div>
- <div class="table__cell">
+ <div class="table__cell firmware__action">
<span class="table__cell-label">Action:</span>
<button class="firmware__action-link" ng-show="firmware.activationStatus == 'Ready'" ng-click="activate(firmware.imageId)">Activate</button>
<button class="firmware__action-link" ng-show="firmware.activationStatus != 'Functional'" ng-click="delete(firmware.imageId, firmware.Version)">Delete</button>
diff --git a/app/configuration/styles/firmware.scss b/app/configuration/styles/firmware.scss
index 1c50dc0..d1b0114 100644
--- a/app/configuration/styles/firmware.scss
+++ b/app/configuration/styles/firmware.scss
@@ -59,6 +59,10 @@
flex: 30%;
}
+.firmware__action {
+ flex: 8%;
+}
+
.firmware__active-version {
color: $medblue;
font-size: .8em;
@@ -138,4 +142,4 @@
.firmware__upload-tftp {
padding-top: 2em;
padding-left: 1em;
-} \ No newline at end of file
+}
OpenPOWER on IntegriCloud