Code Review / openstack-build / horizon-build.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 88a1048)
Replace patch for Horizon UI tables formatting error. OSCI-1102 openstack-ci/build/havana openstack-ci/fuel-4.1.1/2013.2.2 openstack-ci/fuel-4.1/2013.2.2
authorVitaly Parakhin <vparakhin@mirantis.com>
Wed, 5 Mar 2014 12:18:26 +0000 (14:18 +0200)
committerVitaly Parakhin <vparakhin@mirantis.com>
Thu, 6 Mar 2014 09:24:20 +0000 (11:24 +0200)
Change-Id: Id40e2e3fc98e19f9805980af2b28c34842580512

debian/patches/mos-fix-murano-savana-dashboard.patch patch | blob | history
rpm/SOURCES/mos-fix-murano-savana-dashboard.patch patch | blob | history

diff --git a/debian/patches/mos-fix-murano-savana-dashboard.patch b/debian/patches/mos-fix-murano-savana-dashboard.patch
index 0d1153c958be83817fbb9cac5ddf555f06914f08..0c3bb174ff63e573c85332ac9e79c4cf715be307 100644 (file)
--- a/debian/patches/mos-fix-murano-savana-dashboard.patch
+++ b/debian/patches/mos-fix-murano-savana-dashboard.patch
@@ -1,21 +1,22 @@
 diff --git a/horizon/templates/base.html b/horizon/templates/base.html
-index 1b791d0..f767d7c 100644
+index e7e5938..27c3756 100644
 --- a/horizon/templates/base.html
 +++ b/horizon/templates/base.html
-@@ -10,6 +10,7 @@
-     {% endblock %}
-     {% include "horizon/_conf.html" %}
-     {% include "horizon/client_side/_script_loader.html" %}
-+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
-   </head>
-   <body id="{% block body_id %}{% endblock %}">
-     {% block content %}
-diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashb
-index e69de29..60f4074 100644
+@@ -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,4 @@
+@@ -0,0 +1,5 @@
 +.nav-tabs > li > a {
-+padding-right: 5px;
-+padding-left: 5px;
++    padding-right: 5px !important;
++    padding-left: 5px !important;
++    margin-right: 0px !important;
 +}
diff --git a/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch b/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch
index 0d1153c958be83817fbb9cac5ddf555f06914f08..0c3bb174ff63e573c85332ac9e79c4cf715be307 100644 (file)
--- a/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch
+++ b/rpm/SOURCES/mos-fix-murano-savana-dashboard.patch
@@ -1,21 +1,22 @@
 diff --git a/horizon/templates/base.html b/horizon/templates/base.html
-index 1b791d0..f767d7c 100644
+index e7e5938..27c3756 100644
 --- a/horizon/templates/base.html
 +++ b/horizon/templates/base.html
-@@ -10,6 +10,7 @@
-     {% endblock %}
-     {% include "horizon/_conf.html" %}
-     {% include "horizon/client_side/_script_loader.html" %}
-+    <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}/dashboard/less/fix_tabs.css" />
-   </head>
-   <body id="{% block body_id %}{% endblock %}">
-     {% block content %}
-diff --git a/openstack_dashboard/static/dashboard/less/fix_tabs.css b/openstack_dashboard/static/dashb
-index e69de29..60f4074 100644
+@@ -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,4 @@
+@@ -0,0 +1,5 @@
 +.nav-tabs > li > a {
-+padding-right: 5px;
-+padding-left: 5px;
++    padding-right: 5px !important;
++    padding-left: 5px !important;
++    margin-right: 0px !important;
 +}