Minor style changes requested and otherwise noticed
authorChris Burton <cburton@nflibrary.ca>
Fri, 17 Jul 2020 00:52:42 +0000 (20:52 -0400)
committerGalen Charlton <gmc@equinoxinitiative.org>
Thu, 10 Sep 2020 13:52:52 +0000 (09:52 -0400)
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Open-ILS/src/templates-bootstrap/opac/browse.tt2
Open-ILS/src/templates-bootstrap/opac/css/style.css.tt2
Open-ILS/src/templates-bootstrap/opac/mylist.tt2
Open-ILS/src/templates-bootstrap/opac/parts/base.tt2
Open-ILS/src/templates-bootstrap/opac/parts/css/colors.tt2
Open-ILS/src/templates-bootstrap/opac/parts/footer.tt2
Open-ILS/src/templates-bootstrap/opac/parts/login/login_modal.tt2
Open-ILS/src/templates-bootstrap/opac/parts/searchbar.tt2

index bf34c23..1ab9f77 100644 (file)
@@ -57,9 +57,9 @@
                         alt="[% l('Search in progress icon') %]" />
                     </form>
                 </div>
-                       <div class="row text-center my-5 border-top border-bottom">
+                       <div class="row my-5 border-top border-bottom">
                 [% BLOCK browse_pager %]
-                <div class="browse-pager col-12">
+                <div class="browse-pager text-center col-12">
                 <div class="mx-auto">
                     [% IF ctx.back_pivot %]
                     <a class="btn btn-outline-primary btn-sm" href="[% mkurl('', {bpivot => ctx.back_pivot}) %]" onclick="$('browse-pager-spinner-[% id %]').className = '';">&larr; [%l ('Back') %]</a>
index 3f7291f..56f44b3 100644 (file)
@@ -350,8 +350,7 @@ html{
     min-height: 100vh;
 }
 body {
-height:100%;
-min-height: 100vh;
+    min-height: 100vh;
     margin:0;
     font-family: [% css_fonts.font_main %] !important;
     font-size: [% css_fonts.size_base %];
@@ -1133,8 +1132,7 @@ div.format_icon {
 
 #content-wrapper {
     background-color: [% css_colors.background %];
-    min-height: 600px;
-        height: auto;
+    height: auto;
     display: grid;
 }
 
@@ -1397,12 +1395,14 @@ tr.result_table_row > td.result_table_pic_header {
     position: relative;
 }
 #record_basket_count_floater {
-    background-color: [% css_colors.accent_lighter %];
+    background-color: #ddd;
     position: absolute;
-    top: -3px;
-    right: -3px; /* relative to icon, so don't want to adjust for RTL */
+    top: 0px;
+    right: -10px;
     z-index: 2;
+    text-align: center;
     border-radius: 50%;
+    width: 20px;
 }
 #record_basket_count_floater a {
     text-decoration: none;
@@ -3775,18 +3775,18 @@ label[for*=expert_]
     margin: 0px 10px;
 }
 
-.title{
-    font-size: large;
-}
 
 #homeLogo{
-    opacity: 0.5; 
     filter: alpha(opacity=50); 
     background-color: #fff; /* Used if the image is unavailable */
     height: 500px; /* You must set a specified height */
     background-position: center; /* Center the image */
     background-repeat: no-repeat; /* Do not repeat the image */
     background-size: contain; /* Resize the background image to cover the entire container */
-    background-image: url("https://evergreen-ils.org/wp-content/uploads/2018/09/Evergreen-Final-Logo.png");
+    background-image: url("[% ctx.media_prefix %]/images/Evergreen-Final-Logo.png");
 
 }
+
+.navbar-dark .navbar-nav .nav-link{
+    color: #fff !important;
+}
\ No newline at end of file
index fe94c6d..b0fda07 100644 (file)
@@ -8,7 +8,7 @@
     <div class="mobile_hide">
     [% INCLUDE "opac/parts/searchbar.tt2" %]
     </div>
-    <div id="content-wrapper">
+    <div class="container">
         <div id="main-content">
             [%  IF ctx.mylist.size;
                     INCLUDE "opac/parts/anon_list.tt2";
index b492b80..e743103 100644 (file)
         [% END %]
         <meta name = "viewport" content = "initial-scale = 1.0">
         <!--Added bootstrap dependancies-->
-        <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
-               <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-               <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-               <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
-        <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css[% ctx.cache_key %]" />
+        <link rel="stylesheet" href="[% ctx.media_prefix %]/css/bootstrap/bootstrap.min.css">
+               <script src="[% ctx.media_prefix %]/js/bootstrap/jquery-3.5.1.min.js"></script>
+               <script src="[% ctx.media_prefix %]/js/bootstrap/popper.min.js"></script>
+               <script src="[% ctx.media_prefix %]/js/bootstrap/bootstrap.min.js"></script>  <link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css[% ctx.cache_key %]" />
         <link rel="stylesheet" type="text/css" href="[% ctx.opac_root %]/css/style.css[% ctx.cache_key %]&amp;dir=[%
           IF ctx.get_i18n_l(ctx.eg_locale).rtl == 't' %]rtl[%
           ELSE %]ltr[% END %]" />
         [% END %]
         [% PROCESS 'opac/parts/stripe.tt2' %]
     </head>
-    <body[% IF want_dojo; ' class="tundra"'; END %]>
+    <body[% IF want_dojo; ' class="tundra d-flex flex-column min-vh-100"'; ELSE; ' class="tundra d-flex flex-column min-vh-100"';  END %]>
         <h1 class="sr-only">[% l('Catalog') %]</h1>
         [%#Each content page needs (at minimum) an <h2> describing the content%]
-        <div style="min-height:100%;">
+        <div>
         [% content %]
         </div>
         [% INCLUDE 'opac/parts/login/login_modal.tt2' %]
index d758124..6042509 100644 (file)
@@ -4,8 +4,8 @@
         
 #The counts that appear in the navigation when signed into the OPAC -EX. X Ready For Pickup where x is the modified number
 
-       zero_count = "#a0ff9e", #Logged in item/charges count at 0
-        non_zero_count = "#ff0016", #Logged in item/charges count NOT at 0
+       zero_count = "#c1ffbf", #Logged in item/charges count at 0
+        non_zero_count = "#ffc107", #Logged in item/charges count NOT at 0
 
        facets_back = "#00593d", #search list facet backgrounds
        footer_link = "#fff",
index 7b9f463..75c20f0 100644 (file)
@@ -1,11 +1,11 @@
 [% IF !ctx.is_staff %]
-<div id="footer-wrap">
+<div id="footer-wrap" class="mt-auto">
 <div id="footer" class="text-center">
 <nav class="navbar navbar-expand-lg navbar-dark ">
 <!--Home-->
  
   
-  <div class="collapse navbar-collapse" id="navbarNav" style="height:auto !important;">
   <!--Left Links-->
   <div class="row w-100">
   <div class="col-12">
     </div>
     [% END %]
     
- <!--   <div id="footer_logo my-2">
-        <a href="http://evergreen-ils.org">
-            [% INCLUDE "opac/parts/topnav_logo.tt2" %]
-        </a>
-    </div> -->
-    
-      <div id="copyright_text" class="mt-3">
+      <div id="copyright_text" class="mt-3 text-center">
         [% l('Copyright &copy; 2006-[_1] Georgia Public Library Service, and others', date.format(date.now, '%Y')) %]
     <div id="footer_logo">
         [% l('Powered by') %]
@@ -64,5 +58,4 @@
     </div>
     
 </div>
-</div>
 [% END %]
index 37c52e0..e8090bb 100644 (file)
 <div id='login-form-box' class='container text-center'>
     <div class="mx-auto row py-4">
         <div class='col-md-6'>
-            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]</label>
+            <label for='username_field' class="lbl1" >[% l('Library Card Number') %]</label><br>
+            <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Request A Card') %]</a>
             <div class="input_bg mb-2">
                 <input class="form-control" type='text' id="username_field" name="username" autofocus />
             </div>
             <div>[% l('Use the full number.') %]</div>
             <div>[% l('Example: 280800001234567') %]</div>
             <br>
-            <a href='[% mkurl(ctx.opac_root _ '/register', {}, 1) %]'>[% l('Request A Card') %]</a>
+            
         </div>
         <div class='col-md-6'>
-            <label for="password_field" class="lbl1" >[% l('PIN') %]</label>
+            <label for="password_field" class="lbl1" >[% l('PIN') %]</label><br>
+             [% IF reset_password == 'true' %]
+            <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot Your Password?') %]</a>
+            [% END %]
             <div class="input_bg mb-2">
                 <input class="form-control" id="password_field" name="password" type="password" />
             </div>
             [% INCLUDE "opac/parts/login/password_hint.tt2" %]
             <br>
-             [% IF reset_password == 'true' %]
-            <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot Your Password?') %]</a>
-            [% END %]
+            
         </div>
         <div style="clear: both; padding-top: 15px;" class="col-12">
         [%
index 144e3f4..081e2a1 100644 (file)
@@ -108,10 +108,10 @@ END;
       <div class="row">
       <span class="mx-auto mt-3">
         <input id="detail" type="hidden" name="detail_record_view" value="[% show_detail_view %]"/>
-        <input id='search-submit-go' type="submit" value="[% l('Search') %]" class="btn btn-opac"
+        <input id='search-submit-go' type="submit" value="[% l('Search') %]" class="btn btn-opac m-2"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden";[% IF ctx.depth_sel_button AND NOT took_care_of_form %] $("search-submit-go-depth").className="hidden";[% END %]}, 2000)'/>
         [%- IF ctx.depth_sel_button AND NOT took_care_of_form %]
-        <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% #ctx.depth_sel_button_class %] btn btn-opac"
+        <button id='search-submit-go-depth' type="submit" value="[% ctx.depth_sel_depth %]" name="depth" class="[% #ctx.depth_sel_button_class %] btn btn-opac m-2"
             onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"; $("search-submit-go-depth").className="hidden";}, 2000)' title="[% ctx.depth_sel_tooltip | html %]">[% ctx.depth_sel_button_label | html %]</button>
         [%- END %]
         <img id='search-submit-spinner' src='[% ctx.media_prefix %]/opac/images/progressbar_green.gif[% ctx.cache_key %]' style='height:16px;width:16px;' class='hidden' alt='[% l("Search In Progress") %]'/>