From 01e66ec78f07b3c0ed3ffeeeae672634f65f97ea Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 20 Dec 2017 17:09:30 +0000 Subject: [PATCH] Bug 19851: Improve responsive layout handling of staff client menu bar This patch modifies CSS and markup in the staff client header to override the default responsive style of the menu bar. The changed layout will keep the menu bar items in a horizontal line at lower screen widths. To test, apply the patch and clear your browser cache if necessary. - Log in to the staff client and confirm that the appearance of the menu bar at the top of the screen looks correct at various browser widths. - Confirm that the logged-in user menu label and help link expand and collapse according to browser width. Signed-off-by: Dominic Pichette Signed-off-by: Josef Moravec Signed-off-by: Jonathan Druart --- .../intranet-tmpl/prog/css/staff-global.css | 71 ++++++++++++++++ .../prog/en/includes/doc-head-close.inc | 2 +- .../intranet-tmpl/prog/en/includes/header.inc | 83 +++++++++++++------ 3 files changed, 128 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css index 9a18b097c5..515c4e3c76 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -3137,3 +3137,74 @@ fieldset.rows + fieldset.action { table#ill-requests { width: 100% !important; } + +#helper span { + display: none; +} + +#logged-in-info-full { + display: none; +} + +.loggedin-menu-label { + color: #777; + font-size: 12px; + line-height: 1.42857143; + padding: 4px 12px; + white-space: nowrap; +} + +.loggedin-menu-label.divider { + padding: 0; +} + +.loggedin-menu-label span { + color: #000; + font-weight: bold; +} + +@media (min-width: 200px) { + .navbar-nav > li { + float: left; + } + .navbar-right { + float: right !important; + margin-right: -15px; + } + .navbar-nav { + float: left; + margin: 0; + } + + .navbar-nav .open .dropdown-menu { + position: absolute; + float: left; + left: auto; + right: 0; + width: auto; + background-color: #fff; + border: 1px solid rgba(0,0,0,0.15); + box-shadow: 0 6px 12px rgba(0,0,0,0.175); + } +} + +@media (min-width: 800px) { + #helper span { + display: inline; + } + + #helper i { + display: none; + } + + #logged-in-info-full { + display: inline; + } + + #logged-in-info-brief { + display: none; + } + .loggedin-menu-label { + display: none; + } +} \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc index 48484f6547..91402eb3ed 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc @@ -2,7 +2,7 @@ [% USE String %] [% PROCESS 'html_helpers.inc' %] - + [%# Prevent XFS attacks -%] [% UNLESS popup %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc index 7573ac2521..4f3d579492 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc @@ -12,7 +12,9 @@ [% IF ( intranetbookbag ) %] -
  • Cart
    • +
  • + Cart +
    • [% END %] [% IntranetNav %]
  • @@ -20,54 +22,81 @@
    • -