Merge branch 'feature/exaggerated-footer' into develop

geobtaa · Oct 25, 2024 · 92b9fde · 92b9fde
2 parents f5f4441 + dd987e8
commit 92b9fde
Show file tree

Hide file tree

Showing 18 changed files with 230 additions and 73 deletions.
diff --git a/app/assets/images/footer/elevation_map_mpls.acorn b/app/assets/images/footer/elevation_map_mpls.acorn
diff --git a/app/assets/images/footer/elevation_map_mpls.png b/app/assets/images/footer/elevation_map_mpls.png
diff --git a/app/assets/images/footer/elevation_map_mpls_blueish.png b/app/assets/images/footer/elevation_map_mpls_blueish.png
diff --git a/app/assets/images/footer/elevation_map_mpls_blueish_8.png b/app/assets/images/footer/elevation_map_mpls_blueish_8.png
diff --git a/app/assets/images/footer/notes.txt b/app/assets/images/footer/notes.txt
@@ -0,0 +1,2 @@
+Elevation map mpls:
+https://geodev.btaa.org/catalog/p16022coll289:22
diff --git a/app/assets/images/gin-white.png b/app/assets/images/gin-white.png
diff --git a/app/assets/javascripts/geoportal/modules/home.js b/app/assets/javascripts/geoportal/modules/home.js
@@ -6,7 +6,8 @@ Blacklight.onLoad(function() {
 
     console.log('Map: Home')
 
-    geoblacklight.map.setZoom(2);
+    // geoblacklight.map.setZoom(3);
+    geoblacklight.map.setView(new L.LatLng(20.737, -64.990), 3);
     geoblacklight.map.addControl(L.control.geosearch({
       baseUrl: '/',
       dynamic: false,

diff --git a/app/assets/stylesheets/geoportal/_footer.scss b/app/assets/stylesheets/geoportal/_footer.scss
@@ -3,36 +3,48 @@ $white: #FFFFFF; // 100%
 $gray: #CCCCCC; // 80%
 $black: #000000; // 0%
 $btaa-blue: #005E8E;
+$btaa-blue-dark: #003c5b;
 $radius: 4px;
 
+// Sass link color variables
+$link-color: $white;
+$hover-color: darken($link-color, 20%);
+$visited-color: lighten($link-color, 20%);
 
 section#footer-app {
   color:$white;
-  padding-top:1rem;
   padding-bottom:1rem;
   background-color: $btaa-blue;
-  a {
-    color:$white;
-  }
-  ul {
-    margin-bottom:0rem;
-  }
-  img {
-    width: 20px;
-    height: 20px;
-  }
-}
-
-footer {
-  background-color:$gray;
-  padding-top:2rem;
-  padding-bottom:2rem;
+  border-top: 1rem solid $btaa-blue-dark;
+  border-bottom: 0.5rem solid $btaa-blue-dark;
+  background-image: asset_url('footer/elevation_map_mpls_blueish.png');
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  background-position: center;
 
+  // Link styling
   a {
-    color: $black;
+  color: $link-color;
+  text-decoration: none;
+
+    &:hover{
+    color: $hover-color;
+      border-bottom: 1px solid $hover-color;
+    }
+
+    &:visited{
+      color: $visited-color;
+      border-color: $visited-color;
+    }
   }
-}
+
+  #footer-title {
+    padding-top:1.5rem;
 
-#university-libraries {
-  border:4px solid $white;
+    a {
+      &:hover {
+        border-bottom: none;
+      }
+    }
+  } 
 }
diff --git a/app/assets/stylesheets/geoportal/_homepage.scss b/app/assets/stylesheets/geoportal/_homepage.scss
@@ -5,6 +5,10 @@ $black: #000000; // 0%
 $btaa-blue: #005E8E;
 $radius: 4px;
 
+html {
+  background-color: $btaa-blue;
+}
+
 #survey-button {
   position: fixed;
   bottom:2rem;
@@ -22,18 +26,22 @@ main.homepage {
   padding-left:15px;
   padding-right:15px;
 
+  &.container-fluid {
+    margin-top:0rem;
+  }
+
   #home-content {
-    margin-top:5.5rem;
+    margin-top:0rem;
+
     h2 {
       margin-top:1rem;
     }
   }
 
   #wrapper-map {
     div#map-container {
-      position:fixed;
-      top:5.5rem;
       height: 100%;
+      width: 100%;
       padding:0px;
 
       div#map {

diff --git a/app/assets/stylesheets/geoportal/_navbar.scss b/app/assets/stylesheets/geoportal/_navbar.scss
@@ -5,12 +5,23 @@ $black: #000000; // 0%
 $btaa-blue: #005E8E;
 $radius: 4px;
 
+// Sass link color variables
+$link-color: $white;
+$hover-color: darken($link-color, 20%);
+$visited-color: lighten($link-color, 20%);
 
-div#cic-header-navbar {
+div#b1g-header-navbar {
   margin-bottom:0;
   background-color: darken($btaa-blue, 10%);
   padding-left:0.5rem;
   padding-right:0.5rem;
+
+  a#btaa-logo {
+    &:hover {
+      border-bottom: none !important;
+      text-decoration: none !important;
+    }
+  } 
 }
 
 #header-navbar {
@@ -29,9 +40,21 @@ div#cic-header-navbar {
 div#application-header {
   background-color:$btaa-blue;
 
+  // Link styling
   a {
-    color:$white !important;
-  }
+    color: $link-color;
+    text-decoration: none;
+
+      &:hover{
+      color: $hover-color;
+        border-bottom: 1px solid $hover-color;
+      }
+
+      &:visited{
+        color: $visited-color;
+        border-color: $visited-color;
+      }
+    }
 
   .navbar-brand {
     margin-top: -1rem;
@@ -40,12 +63,21 @@ div#application-header {
     background:none;
     overflow:visible;
     text-indent:0;
-    border:none;
     height: 50px;
     margin-left:1rem;
-  }
-  .navbar-brand:hover {
-    color: $white !important;
+    border:none !important;
+    text-decoration: none !important;
+
+    &:hover {
+      color: $white !important;
+      text-decoration: none !important;
+    }
+
+    &:visited {
+      color: $visited-color !important;
+      text-decoration: none !important;
+      border: none !important;
+    }
   }
 
   span.icon-bar {
@@ -71,10 +103,4 @@ form.search-query-form {
       font-size: 32px;
     }
   }
-
-  main {
-    #home-content {
-      margin-top: 3rem !important;
-    }
-  }
 }
diff --git a/app/assets/stylesheets/geoportal/_results.scss b/app/assets/stylesheets/geoportal/_results.scss
@@ -6,13 +6,19 @@
   }
 }
 
-// a11y active pagination page link 
-.page-link {
-  text-decoration: underline;
-}
+.page-links a, a.page-link {
+
+  color: #005E8E;
 
-.page-links a {
-  text-decoration: underline;
+  &:hover {
+    color: #005E8E !important;
+    border-color: #dee2e6 !important;
+  }
+
+  &:visited {
+    color: #005E8E !important;
+    border-color: #dee2e6 !important;
+  }
 }
 
 .page-item.active .page-link {

diff --git a/app/assets/stylesheets/geoportal/_todo.scss b/app/assets/stylesheets/geoportal/_todo.scss
@@ -5,9 +5,42 @@ $black: #000000; // 0%
 $btaa-blue: #005E8E;
 $radius: 4px;
 
-// link 
-a { text-decoration: underline; }
+// link color variables
+$link-color: $btaa-blue;
+$hover-color: darken($link-color, 20%);
+$visited-color: lighten($link-color, 15%);
+
+// link styling
+a {
+  color: $link-color;
+  text-decoration: none;
+
+  &:hover{
+  color: $hover-color;
+  }
+
+  &:visited{
+    color: $visited-color;
+    border-color: $visited-color;
+  }
+}
 a.btn { text-decoration: none; }
+a.btn.btn-primary {
+  color: $white;
+  background-color: $btaa-blue;
+  border-color: $btaa-blue;
+
+
+  &:hover {
+    color: $white;
+    background-color: #003c5b;
+    border-color: #006fa8;
+  }
+
+  &:visited {
+    color: $white;
+  }
+}
 a.navbar-brand { text-decoration: none; }
 
 #geoportal-about {

diff --git a/app/views/_user_util_links.html.erb b/app/views/_user_util_links.html.erb
@@ -3,7 +3,7 @@
     <li class="nav-item"><%= action %></li>
   <% end %>
   <li class="nav-item"><%=link_to('About', 'https://gin.btaa.org', {class: 'nav-link'})%></li>
-  <li class="nav-item"><%=link_to('News', 'https://geobtaa.blogspot.com/', {class: 'nav-link'})%></li>
+  <li class="nav-item"><%=link_to('Collection Stories', 'https://geobtaa.blogspot.com/', {class: 'nav-link'})%></li>
   <li class="nav-item"><%=link_to('Help', 'https://gin.btaa.org/guides/', {class: 'nav-link'})%></li>
   <li class="nav-item"><%=link_to('Feedback', '/feedback', {class: 'nav-link'})%></li>
 </ul>
diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb
@@ -77,11 +77,6 @@
                   </div>
 
                   <div class="card-body">
-                    <p>
-                      <%= link_to "https://gin.btaa.org" do %>
-                        <%= image_tag('gin-cropped.png', {alt: "Big Ten Academic Alliance Logo", height: '80px'}) %> 
-                      <% end %>
-                    </p>
                     <p>The Big Ten Academic Alliance Geoportal provides discoverability and facilitates access to geospatial resources. The resources in the portal are selected and curated by librarians and geospatial specialists at fifteen research institutions in the <a href="http://www.btaa.org">Big Ten Academic Alliance</a>.</p>
                     <p>The resources include GIS datasets, web services, and digitized historical maps. <a href="https://gin.btaa.org">Learn more</a> about the research institutions involved and the sources of the geospatial records.</p>
                     <p class="project-action">
@@ -96,7 +91,7 @@
       </div>
 
       <div id="wrapper-map" class="d-none d-md-block col-md-6" role="application">
-        <div id='map-container' class="d-md-block col-md-6">
+        <div id='map-container'>
           <div id='map' role='presentation' aria-label='map-search' data-map='home' data-catalog-path="<%=blacklight_path%>" data-map-bbox="<%=params[:bbox]%>" data-basemap="<%=geoblacklight_basemap%>">
             <div id="progress"><div id="progress-bar"></div></div>
           </div>

diff --git a/app/views/layouts/blacklight/base.html.erb b/app/views/layouts/blacklight/base.html.erb
@@ -55,6 +55,9 @@
     <% if homepage? %>
       <%= render :partial=>'shared/flash_msg', layout: 'shared/flash_messages' %>
       <%= render 'home' %>
+      <section id="footer-app" aria-label='Application Footer'>
+        <%= render :partial => 'shared/footer_app' %>
+      </section>
     <% else %>
       <main id="main-container" class="<%= container_classes %>">
         <%= content_for(:container_header) %>
@@ -68,10 +71,6 @@
       <section id="footer-app" aria-label='Application Footer'>
         <%= render :partial => 'shared/footer_app' %>
       </section>
-
-      <footer class='mt-0' aria-label='University of Minnesota'>
-        <%= render :partial => 'shared/footer_umn' %>
-      </footer>
     <% end %>
 
     <%= render partial: 'shared/modal' %>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Elevation map mpls:
		https://geodev.btaa.org/catalog/p16022coll289:22