diff options
| author | Richard Jones <r1chardj0n3s@gmail.com> | 2015-05-01 11:39:37 +1000 |
|---|---|---|
| committer | Matthias Runge <mrunge@redhat.com> | 2015-09-02 08:42:23 +0200 |
| commit | 8ed76248967ca741226dcebec1aa780e678fcf23 (patch) | |
| tree | 0f92008473ee7cf4914c37e6e59510a7d1589282 | |
| parent | 7c8fc8f1b08e4ecce1e481c23bb1ff8309ba928f (diff) | |
| download | horizon-8ed76248967ca741226dcebec1aa780e678fcf23.tar.gz | |
Compatibility fix for pyscss 1.3.4
This commit alters the action-list.scss file so it is compatible
with the newer version of pyScss (1.3.4+), allowing us to
upgrade to that version.
This change is a prerequisite for the update to get into the
global requirements so that that change can pass testing.
Change-Id: Idec7ce039b57476ce20b7b678431459c2ca0bdbf
Co-Authored-By: Kelly Domico <kelly.domico@hp.com>
(cherry picked from commit cca93ade7c23c1f2794376161b6660a459292eee)
| -rwxr-xr-x[-rw-r--r--] | horizon/static/angular/action-list/action-list.scss | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss index 58092e051..5b3fcc487 100644..100755 --- a/horizon/static/angular/action-list/action-list.scss +++ b/horizon/static/angular/action-list/action-list.scss @@ -22,16 +22,33 @@ action-list.btn-group { right: -0.35em; z-index: 3; - & + .btn:not(:first-child) { + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), + & + .btn.single-button:not(:first-child), + & + .btn.split-button:not(:first-child):not(:last-child) { border-top-left-radius: 4px; border-bottom-left-radius: 4px; + } + } - &.btn-sm { + &.btn-group-sm { + notifications { + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), + & + .btn.single-button:not(:first-child), + & + .btn.split-button:not(:first-child):not(:last-child) { border-top-left-radius: 3px; border-bottom-left-radius: 3px; } + } + } - &.btn-lg { + &.btn-group-lg { + notifications { + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), + & + .btn.single-button:not(:first-child), + & + .btn.split-button:not(:first-child):not(:last-child) { border-top-left-radius: 6px; border-bottom-left-radius: 6px; } |