Skip to content

Commit

Permalink
Add new footer; adjust app-wide link behavior
Browse files Browse the repository at this point in the history
Fixes #614
Fixes #615
  • Loading branch information
ewlarson committed Sep 25, 2024
1 parent f5f4441 commit 87e68d8
Show file tree
Hide file tree
Showing 7 changed files with 166 additions and 42 deletions.
Binary file modified app/assets/images/gin-white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 29 additions & 21 deletions app/assets/stylesheets/geoportal/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,44 @@ $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;

// 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;
}
}
}
}
37 changes: 31 additions & 6 deletions app/assets/stylesheets/geoportal/_navbar.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ $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 {
margin-bottom:0;
Expand All @@ -29,9 +33,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;
Expand All @@ -40,12 +56,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 {
Expand Down
37 changes: 35 additions & 2 deletions app/assets/stylesheets/geoportal/_todo.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion app/views/_user_util_links.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>
4 changes: 0 additions & 4 deletions app/views/layouts/blacklight/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,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' %>
Expand Down
78 changes: 70 additions & 8 deletions app/views/shared/_footer_app.html.haml
Original file line number Diff line number Diff line change
@@ -1,16 +1,78 @@
%div.container-fluid
%div.row
%div.col-xs-12.col-lg-12
%h3 Big Ten Academic Alliance Geoportal
%ul.list-horizontal
%div#footer-title.col-xs-12.col-lg-12
= link_to "https://gin.btaa.org" do
= image_tag('gin-white.png', {alt: "Big Ten Academic Alliance Logo", height: '80px'})

%div.col-xs-12.col-lg-6

%h3.mt-3 About & Help
%ul.list-unstyled
%li
= link_to "About Us", "https://gin.btaa.org/about/about-us/"
%li
= link_to "Program Updates", "https://gin.btaa.org/updates"
%li
= link_to "Contact Us", "https://geo.btaa.org/feedback"
%li
= link_to "Help Guides", "https://gin.btaa.org/guides/"
%li
= link_to "Tutorials", "https://gin.btaa.org/tutorials"

%h3.mt-3 Policies
%ul.list-unstyled
%li
= link_to "Harmful Language Statement", "https://gin.btaa.org/library/harmful-language/"
%li
= link_to "Collection Development Policy", "https://gin.btaa.org/library/collection-development-policy/"
%li
= link_to "Privacy Policy", "https://www.lib.umn.edu/about/privacy"

%h3.mt-3 Sponsors
%ul.list-unstyled
%li
= link_to "Big Ten Academic Alliance", "https://btaa.org/"
%li
= link_to "BTAA Geospatial Information Network", "https://gin.btaa.org/"
%li
= link_to "University of Minnesota Libraries", "https://lib.umn.edu/"

%div.col-xs-12.col-lg-6
%h3.mt-3 BTAA Member Libraries & Stories
%ul.list-unstyled
%li
= link_to "Collection Stories", "https://geobtaa.blogspot.com/"

%h4.mt-3 Explore Member Libraries
%ul.list-unstyled{style: "column-count: 2;"}
%li
= link_to "University of Chicago", "https://www.lib.uchicago.edu/"
%li
= link_to "University of Illinois", "https://www.library.illinois.edu/"
%li
= link_to "Indiana University", "https://libraries.indiana.edu/"
%li
= link_to "University of Iowa", "https://www.lib.uiowa.edu/"
%li
= link_to "University of Maryland", "https://www.lib.umd.edu/"
%li
= link_to "University of Michigan", "https://www.lib.umich.edu/"
%li
= link_to "Michigan State University", "https://lib.msu.edu/"
%li
= link_to "University of Minnesota", "https://www.lib.umn.edu/"
%li
= link_to "University of Nebraska-Lincoln", "https://libraries.unl.edu/"
%li
= link_to "Northwestern University", "https://www.library.northwestern.edu/"
%li
= link_to "News &amp; Updates".html_safe, 'https://geobtaa.blogspot.com'
= link_to "The Ohio State University", "https://library.osu.edu/"
%li
= link_to "About Us", 'https://gin.btaa.org'
= link_to "Pennsylvania State University", "https://libraries.psu.edu/"
%li
%a{href:'https://gin.btaa.org/library/harmful-language/'} Harmful Language Statement
= link_to "Purdue University", "https://www.lib.purdue.edu/"
%li
%a{href:'https://geo.btaa.org/feedback'} Contact Project Team
= link_to "Rutgers University", "https://www.libraries.rutgers.edu/"
%li
%a{href:'http://www.btaa.org'} Big Ten Academic Alliance Homepage
= link_to "University of Wisconsin-Madison", "https://www.library.wisc.edu/"

0 comments on commit 87e68d8

Please sign in to comment.