diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-04-14 01:47:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-04-14 01:47:52 +0000 |
| commit | b408104735e300db9d7d3e51c6f244209735c940 (patch) | |
| tree | 93d24f1452f2debf04d7e6b1b2f104107b8e66ee | |
| parent | e6c230ded1a7ddb016d09add79d81b16424c907c (diff) | |
| parent | d80559c12d154c8efd6993617173d88fdb7451f1 (diff) | |
| download | horizon-b408104735e300db9d7d3e51c6f244209735c940.tar.gz | |
Merge "Adding styling for disabled and danger action items"
| -rw-r--r-- | horizon/static/angular/action-list/action-list.scss | 11 | ||||
| -rw-r--r-- | horizon/static/angular/action-list/menu-item.html | 5 |
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> |