diff options
author | Mark Asselstine <mark.asselstine@windriver.com> | 2015-10-29 22:54:56 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-10-30 08:36:25 -0400 |
commit | 9b2760a552ede25617e2a67b4f2e9c4cd3972cfa (patch) | |
tree | 73df38a67c2a683b4ee05a21cfb9a3c2b55ff418 /meta-openstack/recipes-devtools/python/python-horizon | |
parent | 96654561e5d5e06d390995e867d86c86711bda73 (diff) | |
download | meta-cloud-services-9b2760a552ede25617e2a67b4f2e9c4cd3972cfa.tar.gz |
horizon: add an upstream patch needed for pyscss 1.3.4
Without this patch we will get an error:
Don't know how to merge conflicting combinators: <SimpleSelector: u'+ .btn:not(:first-child)'> and <SimpleSelector: u'> .btn'>
when attempting to connect to the horizon dashboard.
Signed-off-by: Mark Asselstine <mark.asselstine@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-horizon')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch new file mode 100644 index 0000000..a94d757 --- /dev/null +++ b/meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch | |||
@@ -0,0 +1,68 @@ | |||
1 | From cca93ade7c23c1f2794376161b6660a459292eee Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Jones <r1chardj0n3s@gmail.com> | ||
3 | Date: Fri, 1 May 2015 11:39:37 +1000 | ||
4 | Subject: [PATCH] Compatibility fix for pyscss 1.3.4 | ||
5 | |||
6 | Commit cca93ade7c23c1f2794376161b6660a459292eee from | ||
7 | https://github.com/openstack/horizon.git | ||
8 | |||
9 | This commit alters the action-list.scss file so it is compatible | ||
10 | with the newer version of pyScss (1.3.4+), allowing us to | ||
11 | upgrade to that version. | ||
12 | |||
13 | This change is a prerequisite for the update to get into the | ||
14 | global requirements so that that change can pass testing. | ||
15 | |||
16 | Change-Id: Idec7ce039b57476ce20b7b678431459c2ca0bdbf | ||
17 | Co-Authored-By: Kelly Domico <kelly.domico@hp.com> | ||
18 | --- | ||
19 | .../static/angular/action-list/action-list.scss | 23 +++++++++++++++++++--- | ||
20 | 1 file changed, 20 insertions(+), 3 deletions(-) | ||
21 | mode change 100644 => 100755 horizon/static/angular/action-list/action-list.scss | ||
22 | |||
23 | diff --git a/horizon/static/angular/action-list/action-list.scss b/horizon/static/angular/action-list/action-list.scss | ||
24 | old mode 100644 | ||
25 | new mode 100755 | ||
26 | index 58092e0..5b3fcc4 | ||
27 | --- a/horizon/static/angular/action-list/action-list.scss | ||
28 | +++ b/horizon/static/angular/action-list/action-list.scss | ||
29 | @@ -22,16 +22,33 @@ action-list.btn-group { | ||
30 | right: -0.35em; | ||
31 | z-index: 3; | ||
32 | |||
33 | - & + .btn:not(:first-child) { | ||
34 | + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), | ||
35 | + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), | ||
36 | + & + .btn.single-button:not(:first-child), | ||
37 | + & + .btn.split-button:not(:first-child):not(:last-child) { | ||
38 | border-top-left-radius: 4px; | ||
39 | border-bottom-left-radius: 4px; | ||
40 | + } | ||
41 | + } | ||
42 | |||
43 | - &.btn-sm { | ||
44 | + &.btn-group-sm { | ||
45 | + notifications { | ||
46 | + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), | ||
47 | + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), | ||
48 | + & + .btn.single-button:not(:first-child), | ||
49 | + & + .btn.split-button:not(:first-child):not(:last-child) { | ||
50 | border-top-left-radius: 3px; | ||
51 | border-bottom-left-radius: 3px; | ||
52 | } | ||
53 | + } | ||
54 | + } | ||
55 | |||
56 | - &.btn-lg { | ||
57 | + &.btn-group-lg { | ||
58 | + notifications { | ||
59 | + & + .btn:last-child:not(:first-child):not(.dropdown-toggle), | ||
60 | + & + .btn:not(:last-child):not(:first-child):not(.dropdown-toggle), | ||
61 | + & + .btn.single-button:not(:first-child), | ||
62 | + & + .btn.split-button:not(:first-child):not(:last-child) { | ||
63 | border-top-left-radius: 6px; | ||
64 | border-bottom-left-radius: 6px; | ||
65 | } | ||
66 | -- | ||
67 | 2.1.4 | ||
68 | |||