1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
|
From cca93ade7c23c1f2794376161b6660a459292eee Mon Sep 17 00:00:00 2001
From: Richard Jones <r1chardj0n3s@gmail.com>
Date: Fri, 1 May 2015 11:39:37 +1000
Subject: [PATCH] Compatibility fix for pyscss 1.3.4
Commit cca93ade7c23c1f2794376161b6660a459292eee from
https://github.com/openstack/horizon.git
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>
---
.../static/angular/action-list/action-list.scss | 23 +++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-)
mode change 100644 => 100755 horizon/static/angular/action-list/action-list.scss
diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss
old mode 100644
new mode 100755
index 58092e0..5b3fcc4
--- 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;
}
--
2.1.4
|
