From 3641b517e4f80e2b783a268293d4615e6c7f667d Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Thu, 18 Feb 2016 10:06:41 -0500 Subject: [PATCH] [SIGNED-OFF]Bug 15600: System preferences broken toolbar looks broken This patch reverts some deletions made to staff-global.css in Bug 11559. The deletions broke the appearance of the floating toolbar in system preferences. To test, apply the patch and clear your browser cache if necessary. - Go to Administration -> System preferences and view a tab with enough content to allow you to scroll and test the appearance of the floating toolbar. Confirm that it looks correct. - Open the advanced cataloging editor and confirm that its toolbar looks correct. - Open the normal cataloging editor and confirm that the floating toolbar looks correct and works correctly. Signed-off-by: Hector Castro Works as advertised. Tollbar looks correct --- koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index 66efa01..6039c04 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -422,10 +422,11 @@ dd { font-weight : normal; } +div#toolbar, .btn-toolbar { - background-color : #EDF4F6; - padding: 5px 5px 5px 5px; - border-radius: 5px 5px 0 0; + background-color : #EDF4F6; + padding: 5px 5px 5px 5px; + border-radius: 5px 5px 0 0; border: 1px solid #E6F0F2; } @@ -2462,6 +2463,8 @@ video { background-position:-48px -166px; } +#toolbar .btn, +#toolbar .dropdown-menu, .btn-toolbar .btn, .btn-toolbar .dropdown-menu { font-size: 13px; -- 1.7.10.4