From: Max Rasskazov Date: Fri, 21 Mar 2014 10:50:03 +0000 (+0400) Subject: Patch mos-fix-murano-savana-dashboard.patch moved to code X-Git-Tag: 2014.1~6 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=refs%2Fheads%2Fopenstack-ci%2Ffuel-5.0%2F2014.1.rc2;p=openstack-build%2Fhorizon-build.git Patch mos-fix-murano-savana-dashboard.patch moved to code Patch has been added to specs by: > commit d280d1613b5d96dc776e1688575afaa7115f3b0d > Author: Vitaly Parakhin > Date: Wed Mar 5 14:18:26 2014 +0200 > > Replace patch for Horizon UI tables formatting error. OSCI-1102 > Change-Id: Id40e2e3fc98e19f9805980af2b28c34842580512 --- diff --git a/debian/patches/mos-fix-murano-savana-dashboard.patch b/debian/patches/mos-fix-murano-savana-dashboard.patch deleted file mode 100644 index 0c3bb17..0000000 --- a/debian/patches/mos-fix-murano-savana-dashboard.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/horizon/templates/base.html b/horizon/templates/base.html -index e7e5938..27c3756 100644 ---- a/horizon/templates/base.html -+++ b/horizon/templates/base.html -@@ -4,6 +4,7 @@ - - - {% block title %}{% endblock %} - {% site_branding %} -+ - {% comment %} Load CSS sheets before Javascript {% endcomment %} - {% block css %} - {% include "_stylesheets.html" %} -diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashboard/less/fix_tabs.css -index e69de29..4a2edcf 100644 ---- a/openstack_dashboard/static/dashboard/less/fix_tabs.css -+++ b/openstack_dashboard/static/dashboard/less/fix_tabs.css -@@ -0,0 +1,5 @@ -+.nav-tabs > li > a { -+ padding-right: 5px !important; -+ padding-left: 5px !important; -+ margin-right: 0px !important; -+} diff --git a/debian/patches/series b/debian/patches/series index c54390c..ae21a83 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,4 +7,3 @@ fix-dashboard-manage.patch fix-ubuntu-tests.patch ubuntu_settings.patch -mos-fix-murano-savana-dashboard.patch diff --git a/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch b/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch deleted file mode 100644 index 0c3bb17..0000000 --- a/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/horizon/templates/base.html b/horizon/templates/base.html -index e7e5938..27c3756 100644 ---- a/horizon/templates/base.html -+++ b/horizon/templates/base.html -@@ -4,6 +4,7 @@ - - - {% block title %}{% endblock %} - {% site_branding %} -+ - {% comment %} Load CSS sheets before Javascript {% endcomment %} - {% block css %} - {% include "_stylesheets.html" %} -diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashboard/less/fix_tabs.css -index e69de29..4a2edcf 100644 ---- a/openstack_dashboard/static/dashboard/less/fix_tabs.css -+++ b/openstack_dashboard/static/dashboard/less/fix_tabs.css -@@ -0,0 +1,5 @@ -+.nav-tabs > li > a { -+ padding-right: 5px !important; -+ padding-left: 5px !important; -+ margin-right: 0px !important; -+} diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index 0047781..86696ce 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -33,7 +33,6 @@ Patch0008: 0008-fix-up-issues-with-customization.patch Patch0009: 0009-do-not-truncate-the-logo-related-rhbz-877138.patch Patch0010: 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch #mirantis OpenStack patch -Patch0101: mos-fix-murano-savana-dashboard.patch @@ -162,7 +161,6 @@ Customization module for OpenStack Dashboard to provide a branded logo. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 -%patch0101 -p1 # remove unnecessary .po files find . -name "django*.po" -exec rm -f '{}' \;