From d280d1613b5d96dc776e1688575afaa7115f3b0d Mon Sep 17 00:00:00 2001 From: Vitaly Parakhin Date: Wed, 5 Mar 2014 14:18:26 +0200 Subject: [PATCH] Replace patch for Horizon UI tables formatting error. OSCI-1102 Change-Id: Id40e2e3fc98e19f9805980af2b28c34842580512 --- .../mos-fix-murano-savana-dashboard.patch | 29 ++++++++++--------- .../mos-fix-murano-savana-dashboard.patch | 29 ++++++++++--------- 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/debian/patches/mos-fix-murano-savana-dashboard.patch b/debian/patches/mos-fix-murano-savana-dashboard.patch index 0d1153c..0c3bb17 100644 --- 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" %} -+ - - - {% 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 @@ + + + {% 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,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 0d1153c..0c3bb17 100644 --- 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" %} -+ - - - {% 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 @@ + + + {% 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,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; +} -- 2.45.2