lp1724008 nav bar wraps

With some screen sizes the navbar wraps to two or more lines and
this osbscures content on the page.  Address this issue so that
content at the top of the page remains visible.

Signed-off-by: Mike Risher <mrisher@catalyte.io>
 Changes to be committed:
	modified:   Open-ILS/src/templates/staff/circ/patron/index.tt2
	modified:   Open-ILS/src/templates/staff/circ/patron/register.tt2
	modified:   Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
	modified:   Open-ILS/src/templates/staff/css/circ.css.tt2
	modified:   Open-ILS/src/templates/staff/css/style.css.tt2
	modified:   Open-ILS/src/eg2/src/app/staff/staff.component.css
	modified:   Open-ILS/src/eg2/src/styles.css

diff --git a/Open-ILS/src/eg2/src/app/staff/staff.component.css b/Open-ILS/src/eg2/src/app/staff/staff.component.css
index 508d879..aafb057 100644 (file)
--- a/Open-ILS/src/eg2/src/app/staff/staff.component.css
+++ b/Open-ILS/src/eg2/src/app/staff/staff.component.css
@@ -1,6 +1,6 @@
 #staff-content-container {
   width: 95%;
-  margin-top:56px;
+  margin-top:8px;
   padding-right: 10px;
   padding-left: 10px;
   margin-right: auto;

diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css
index d1144fd..0fbefee 100644 (file)
--- a/Open-ILS/src/eg2/src/styles.css
+++ b/Open-ILS/src/eg2/src/styles.css
@@ -230,3 +230,6 @@ body>.dropdown-menu {z-index: 2100;}
 @media (min-width: 1600px) { .modal-xl { max-width: 1500px; } }
 @media (min-width: 1700px) { .modal-xl { max-width: 1600px; } }
 
+#staff-navbar {
+  position: sticky;
+}

diff --git a/Open-ILS/src/templates/staff/circ/patron/index.tt2 b/Open-ILS/src/templates/staff/circ/patron/index.tt2
index a36c758..47818de 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/index.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/index.tt2
@@ -81,14 +81,6 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
 }]);
 </script>
 
-<!-- add room for the fixed navigation elements -->
-<style ng-if="is_patron_edit">
-  #top-content-container { padding-top: 120px; }
-</style>
-<style ng-if="!is_patron_edit">
-  #top-content-container { padding-top: 80px; }
-</style>
-
 [% END %]
 
 <div class="row" id="patron-fixed-tabs">

diff --git a/Open-ILS/src/templates/staff/circ/patron/register.tt2 b/Open-ILS/src/templates/staff/circ/patron/register.tt2
index 0df6f9e..8a004da 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/register.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/register.tt2
@@ -19,10 +19,7 @@ angular.module('egCoreMod').run(['egStrings', function(s) {
 }]);
 </script>
 <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/circ.css" />
-<style>
-  /* add room for the fixed navigation elements */
-  #top-content-container { padding-top: 170px; }
-</style>
+
 [% END %]
 
 <div ng-view></div>

diff --git a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2 b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
index 1c66575..544a50b 100644 (file)
--- a/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
+++ b/Open-ILS/src/templates/staff/circ/patron/t_edit.tt2
@@ -1,7 +1,7 @@
 [% DOC_IMG = '/images/question-mark.png' %]
 
 <!-- register banner -->
-<div ng-if="!patron_id" ng-class='{"patron-reg-fixed-bar":!offline}'>
+<div ng-if="!patron_id" ng-class='{"patron-reg-bar":!offline}'>
 
   <div class="container-fluid" style="text-align:center">
     <div class="alert alert-info alert-less-pad strong-text-2">

diff --git a/Open-ILS/src/templates/staff/css/circ.css.tt2 b/Open-ILS/src/templates/staff/css/circ.css.tt2
index 3e44581..54195d3 100644 (file)
--- a/Open-ILS/src/templates/staff/css/circ.css.tt2
+++ b/Open-ILS/src/templates/staff/css/circ.css.tt2
@@ -39,10 +39,6 @@ but the ones I'm finding aren't quite cutting it..*/
 }
 
 #patron-fixed-tabs {
-    position: fixed;
-    top: 50px;
-    right: 15px;
-    left: 45px;
     padding-top: 20px;
     padding-top: 10px;
     z-index: 4;
@@ -142,11 +138,7 @@ but the ones I'm finding aren't quite cutting it..*/
     font-weight: normal;
 }
 
-.patron-reg-fixed-bar {
-    position: fixed;
-    top:50px;
-    right: 20px;
-    left: 20px;
+.patron-reg-bar {
     padding-top: 20px;
     padding-bottom: 10px;
     z-index: 1;

diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2
index 5db43ef..303ff5c 100644 (file)
--- a/Open-ILS/src/templates/staff/css/style.css.tt2
+++ b/Open-ILS/src/templates/staff/css/style.css.tt2
@@ -51,7 +51,12 @@ body {
      * narrower than the default Bootstrapp container gutters.
      */
     width: 95%;
-    padding-top: 70px;
+    padding-top: 2px;
+}
+
+#top-navbar.navbar-default {
+    /* this prevents nav bar from covering content when it takes up 2 lines */
+    position: sticky;
 }