From 9b2760a552ede25617e2a67b4f2e9c4cd3972cfa Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Thu, 29 Oct 2015 22:54:56 -0400 Subject: 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: and .btn'> when attempting to connect to the horizon dashboard. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- .../Compatibility-fix-for-pyscss-1.3.4.patch | 68 ++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 meta-openstack/recipes-devtools/python/python-horizon/Compatibility-fix-for-pyscss-1.3.4.patch (limited to 'meta-openstack/recipes-devtools/python/python-horizon') 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 @@ +From cca93ade7c23c1f2794376161b6660a459292eee Mon Sep 17 00:00:00 2001 +From: Richard Jones +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 +--- + .../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 + -- cgit v1.2.3-54-g00ecf