]> review.fuel-infra Code Review - openstack-build/horizon-build.git/commitdiff
Code Review / openstack-build / horizon-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: ed6c982)
Patch mos-fix-murano-savana-dashboard.patch moved to code openstack-ci/fuel-5.0/2014.1.rc2
authorMax Rasskazov <mrasskazov@mirantis.com>
Fri, 21 Mar 2014 10:50:03 +0000 (14:50 +0400)
committerMax Rasskazov <mrasskazov@mirantis.com>
Fri, 21 Mar 2014 10:50:03 +0000 (14:50 +0400)
Patch has been added to specs by:
> commit d280d1613b5d96dc776e1688575afaa7115f3b0d
> Author: Vitaly Parakhin <vparakhin@mirantis.com>
> Date:   Wed Mar 5 14:18:26 2014 +0200
>
>     Replace patch for Horizon UI tables formatting error. OSCI-1102
>     Change-Id: Id40e2e3fc98e19f9805980af2b28c34842580512

debian/patches/mos-fix-murano-savana-dashboard.patch [deleted file] patch | blob | history
debian/patches/series patch | blob | history
rpm/SOURCES/mos-fix-murano-savana-dashboard.patch [deleted file] patch | blob | history
rpm/SPECS/python-django-horizon.spec patch | blob | history

diff --git a/debian/patches/mos-fix-murano-savana-dashboard.patch b/debian/patches/mos-fix-murano-savana-dashboard.patch
deleted file mode 100644 (file)
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 @@
-   <head>
-     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-     <title>{% block title %}{% endblock %} - {% site_branding %}</title>
-+   <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
-     {% 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 c54390ca79c9b124299932f0edf4a514f9aa6323..ae21a83b3462a361733f4ae0cbaa1804c0ef2c55 100644 (file)
--- 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 (file)
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 @@
-   <head>
-     <meta content='text/html; charset=utf-8' http-equiv='Content-Type' />
-     <title>{% block title %}{% endblock %} - {% site_branding %}</title>
-+   <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
-     {% 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 0047781e20ac37b80cb9072584ea2e7e9419cf91..86696ce92aae5f69a95dcfd214d773b2de661ea2 100644 (file)
--- 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 '{}' \;