summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThai Tran <tqtran@us.ibm.com>2015-03-25 12:37:08 -0700
committerThai Tran <tqtran@us.ibm.com>2015-03-25 12:37:08 -0700
commitd80559c12d154c8efd6993617173d88fdb7451f1 (patch)
treeb606b287127473636120133effa0ea912877389a
parent0375299cd7932a277bbd2c0095933c6ad43d2405 (diff)
downloadhorizon-d80559c12d154c8efd6993617173d88fdb7451f1.tar.gz
Adding styling for disabled and danger action items
We need styling for action-list menu-item for disabled and danger items. Added attributes to li and a in menu-item for bootstrap to pick it up. However, bootstrap does NOT support contextual styling of menu-items . Basically, adding danger to the menu-item will not work. We have to add this via our own css Closes-bug: #1435627 Partially Implemenents: blueprint angularize-identity-tables Change-Id: Ia38292e3968e94d17e2ae9b193bbbd28b02097ab
-rw-r--r--horizon/static/angular/action-list/action-list.scss11
-rw-r--r--horizon/static/angular/action-list/menu-item.html5
2 files changed, 13 insertions, 3 deletions
diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss
index 4935c44d7..58092e051 100644
--- a/horizon/static/angular/action-list/action-list.scss
+++ b/horizon/static/angular/action-list/action-list.scss
@@ -3,6 +3,17 @@ action-list.btn-group {
cursor: pointer;
}
+ .dropdown-menu > li {
+
+ &.disabled {
+ opacity: 0.65;
+ }
+
+ > a.text-danger {
+ color: $brand-danger;
+ }
+ }
+
notifications {
bottom: -0.5em;
font-size: 1.1em;
diff --git a/horizon/static/angular/action-list/menu-item.html b/horizon/static/angular/action-list/menu-item.html
index 252e5a4bb..d0d884e8c 100644
--- a/horizon/static/angular/action-list/menu-item.html
+++ b/horizon/static/angular/action-list/menu-item.html
@@ -1,7 +1,6 @@
<!-- Dropdown menu item -->
-<li>
- <a href="#" dropdown-toggle
- class="menu-item {$ disabled ? 'disabled' : '' $}"
+<li role="presentation" ng-class="{ disabled: disabled }">
+ <a role="menuitem" href="#" dropdown-toggle
ng-class="actionClasses"
ng-click="disabled || callback(item)">
<ng-transclude></ng-transclude>