Skip to content

Commit

Permalink
Merge pull request #12 from MITLibraries/footer_updates
Browse files Browse the repository at this point in the history
Update footer
  • Loading branch information
JPrevost authored Oct 1, 2020
2 parents 0c5da35 + 79570e5 commit 908dfd4
Show file tree
Hide file tree
Showing 10 changed files with 305 additions and 57 deletions.
5 changes: 0 additions & 5 deletions .travis.yml

This file was deleted.

146 changes: 146 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
PATH
remote: .
specs:
mitlibraries-theme (0.4.0)
rails (~> 5)
sass (~> 3.4)
sass-rails (~> 5)

GEM
remote: https://rubygems.org/
specs:
actioncable (5.2.4.4)
actionpack (= 5.2.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.4.4)
actionview (= 5.2.4.4)
activesupport (= 5.2.4.4)
rack (~> 2.0, >= 2.0.8)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.4.4)
activesupport (= 5.2.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (5.2.4.4)
activesupport (= 5.2.4.4)
globalid (>= 0.3.6)
activemodel (5.2.4.4)
activesupport (= 5.2.4.4)
activerecord (5.2.4.4)
activemodel (= 5.2.4.4)
activesupport (= 5.2.4.4)
arel (>= 9.0)
activestorage (5.2.4.4)
actionpack (= 5.2.4.4)
activerecord (= 5.2.4.4)
marcel (~> 0.3.1)
activesupport (5.2.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (9.0.0)
builder (3.2.4)
concurrent-ruby (1.1.7)
crass (1.0.6)
erubi (1.9.0)
ffi (1.13.1)
globalid (0.4.2)
activesupport (>= 4.2.0)
i18n (1.8.5)
concurrent-ruby (~> 1.0)
loofah (2.7.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
mini_mime (>= 0.1.1)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (1.0.0)
mimemagic (0.3.5)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
nio4r (2.5.4)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
rack (2.2.3)
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.4.4)
actioncable (= 5.2.4.4)
actionmailer (= 5.2.4.4)
actionpack (= 5.2.4.4)
actionview (= 5.2.4.4)
activejob (= 5.2.4.4)
activemodel (= 5.2.4.4)
activerecord (= 5.2.4.4)
activestorage (= 5.2.4.4)
activesupport (= 5.2.4.4)
bundler (>= 1.3.0)
railties (= 5.2.4.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
rails-html-sanitizer (1.3.0)
loofah (~> 2.3)
railties (5.2.4.4)
actionpack (= 5.2.4.4)
activesupport (= 5.2.4.4)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
rake (13.0.1)
rb-fsevent (0.10.4)
rb-inotify (0.10.1)
ffi (~> 1.0)
sass (3.7.4)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
sass-rails (5.1.0)
railties (>= 5.2.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sprockets (3.7.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sprockets-rails (3.2.2)
actionpack (>= 4.0)
activesupport (>= 4.0)
sprockets (>= 3.0.0)
thor (1.0.1)
thread_safe (0.3.6)
tilt (2.0.10)
tzinfo (1.2.7)
thread_safe (~> 0.1)
websocket-driver (0.7.3)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)

PLATFORMS
ruby

DEPENDENCIES
bundler (~> 2)
minitest (~> 5.0)
mitlibraries-theme!
rake (>= 12.3.3)

BUNDLED WITH
2.1.4
14 changes: 6 additions & 8 deletions app/views/layouts/_institute_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
<div class="wrap-outer-footer-institute layout-band">
<div class="wrap-footer-institute">
<div class="footer-info-institute">
<a class="link-logo-mit" href="https://www.mit.edu" alt="Massachusetts Institute of Technology Logo">
<footer class="footer-info-institute" aria-label="MIT footer" role="contentinfo">
<a class="link-logo-mit" href="https://www.mit.edu">
<span class="sr">MIT</span>
<svg version="1.1" xmlns="https://www.w3.org/2000/svg" x="0" y="0" width="54" height="28" viewBox="0 0 54 28" enable-background="new 0 0 54 28" xml:space="preserve" class="logo-mit"><rect x="28.9" y="8.9" width="5.8" height="19.1" class="color"/><rect width="5.8" height="28"/><rect x="9.6" width="5.8" height="18.8"/><rect x="19.3" width="5.8" height="28"/><rect x="38.5" y="8.9" width="5.8" height="19.1"/><rect x="38.8" width="15.2" height="5.6"/><rect x="28.9" width="5.8" height="5.6"/></svg>
<svg x="0" y="0" width="54" height="28" viewBox="0 0 54 28" enable-background="new 0 0 54 28" xml:space="preserve" class="logo-mit"><rect x="28.9" y="8.9" width="5.8" height="19.1" class="color"/><rect width="5.8" height="28"/><rect x="9.6" width="5.8" height="18.8"/><rect x="19.3" width="5.8" height="28"/><rect x="38.5" y="8.9" width="5.8" height="19.1"/><rect x="38.8" width="15.2" height="5.6"/><rect x="28.9" width="5.8" height="5.6"/></svg>
</a>
<div class="about-mit">
<span class="item">Massachusetts Institute of Technology</span>
<span class="item">77 Massachusetts Avenue</span>
<span class="item">Cambridge MA 02139-4307</span>
</div>
<div class="license">Licensed under the <a href="https://creativecommons.org/licenses/by-nc/2.0/" class="license-cc">Creative Commons Attribution Non-Commercial License</a> unless otherwise noted. <a href="https://libraries.mit.edu/research-support/notices/copyright-notify/">Notify us about copyright concerns</a>.
</div><!-- end .footer-info-institute -->
</div>
<div class="license">Content created by the MIT Libraries, <a href="https://creativecommons.org/licenses/by-nc/4.0/">CC BY-NC</a> unless otherwise noted. <a href="https://libraries.mit.edu/research-support/notices/copyright-notify/">Notify us about copyright concerns</a>.
</div>
</footer><!-- end .footer-info-institute -->
</div>
</div>
57 changes: 46 additions & 11 deletions app/views/layouts/_libraries_footer.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,53 @@
<%= image_tag("mitlib-wordmark.svg", :alt => "MIT Libraries logo") %>
</a>
</div>
<div class="wrap-social">
<p class="text-find-us">Find us on</p>
<a href="https://twitter.com/mitlibraries" title="Twitter">
<svg class="icon-social--twitter" width="2048" height="2048" viewBox="-192 -384 2048 2048" xmlns="http://www.w3.org/2000/svg"><g transform="scale(1 -1) translate(0 -1280)"><path d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" fill="black"></path></g></svg>
<span class="sr">Twitter</span>
</a><!-- End Twitter -->

<a href="https://www.facebook.com/mitlib" title="Facebook">
<svg class="icon-social--facebook" width="2048" height="2048" viewBox="-640 -384 2048 2048" xmlns="http://www.w3.org/2000/svg"><g transform="scale(1 -1) translate(0 -1280)"><path d="M511 980h257l-30 -284h-227v-824h-341v824h-170v284h170v171q0 182 86 275.5t283 93.5h227v-284h-142q-39 0 -62.5 -6.5t-34 -23.5t-13.5 -34.5t-3 -49.5v-142z" fill="black"></path></g></svg>
<span class="sr">Facebook</span>
</a><!-- End Facebook -->

<a href="https://instagram.com/mitlibraries/" title="Instagram">
<svg class="icon-social--instagram" viewBox="0 0 120 120" enable-background="new 0 0 120 120" xml:space="preserve"><path id="Instagram_10_" fill="#FFFFFF" d="M95.1,103.9H24.9c-0.2,0-0.4-0.1-0.6-0.1c-3.9-0.5-7.1-3.4-8-7.2 c-0.1-0.4-0.2-0.9-0.2-1.3V24.8c0-0.2,0.1-0.3,0.1-0.5c0.6-3.9,3.4-7.1,7.3-8c0.4-0.1,0.8-0.2,1.3-0.2h70.4c0.2,0,0.3,0.1,0.5,0.1 c4,0.5,7.2,3.6,8,7.5c0.1,0.4,0.1,0.8,0.2,1.2v70.2c-0.1,0.4-0.1,0.8-0.2,1.2c-0.7,3.6-3.6,6.6-7.2,7.4 C96,103.7,95.5,103.8,95.1,103.9z M25.6,51.7v0.2c0,13,0,26,0,38.9c0,1.9,1.6,3.5,3.5,3.5c20.6,0,41.2,0,61.8,0 c1.9,0,3.5-1.6,3.5-3.5c0-13,0-25.9,0-38.9v-0.3H86c1.2,3.8,1.5,7.6,1.1,11.5c-0.5,3.9-1.7,7.6-3.8,10.9c-2.1,3.4-4.7,6.2-8,8.4 c-8.5,5.8-19.6,6.3-28.6,1.2c-4.5-2.5-8.1-6.1-10.6-10.7c-3.7-6.8-4.3-14-2.1-21.4C31.2,51.7,28.4,51.7,25.6,51.7L25.6,51.7z M60,42.2c-9.7,0-17.6,7.8-17.8,17.5c-0.1,9.9,7.8,17.8,17.4,18c9.9,0.2,18-7.7,18.2-17.4C78,50.4,70,42.2,60,42.2L60,42.2z M86.7,38.7L86.7,38.7c1.4,0,2.9,0,4.3,0c1.9,0,3.4-1.6,3.4-3.5c0-2.8,0-5.5,0-8.3c0-2-1.6-3.6-3.6-3.6c-2.8,0-5.5,0-8.3,0 c-2,0-3.6,1.6-3.6,3.6c0,2.7,0,5.5,0,8.2c0,0.4,0.1,0.8,0.2,1.2c0.5,1.5,1.8,2.4,3.5,2.4C84,38.7,85.3,38.7,86.7,38.7L86.7,38.7z"></path></svg>
<span class="sr">Instagram</span>
</a><!-- End Instagram -->

<a href="https://www.youtube.com/user/MITLibraries" title="YouTube">
<svg aria-hidden="true" focusable="false" data-prefix="fab" data-icon="youtube" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512" class="icon-social--youtube"><path fill="black" d="M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z" class=""></path></svg>
<span class="sr">YouTube</span>
</a><!-- End YouTube -->

<a href="https://libguides.mit.edu/mit-feeds" title="RSS">
<svg class="icon-social--rss" width="2048" height="2048" viewBox="-320 -384 2048 2048" xmlns="http://www.w3.org/2000/svg"><g transform="scale(1 -1) translate(0 -1280)"><path d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" fill="black"></path></g></svg>
<span class="sr">RSS</span>
</a><!-- End RSS -->
</div><!-- end .social -->
<div class="wrap-middle">
<div class="wrap-sitemap">
<nav class="sitemap-libraries-abbrev" aria-label="MIT Libraries site menu">
<h2 class="sr">MIT Libraries navigation</h2>
<a class="item" href="https://libraries.mit.edu/search">Search</a>
<a class="item" href="https://libraries.mit.edu/hours">Hours &amp; locations</a>
<a class="item" href="https://libraries.mit.edu/borrow">Borrow &amp; request</a>
<a class="item" href="https://libraries.mit.edu/research-support">Research support</a>
<a class="item" href="https://libraries.mit.edu/about">About us</a>
</nav>
</div><!-- end .links-all -->
<div class="wrap-policies">
<nav aria-label="MIT Libraries policy menu">
<span class="item"><a href="https://libraries.mit.edu/privacy" class="link-sub">Privacy</a></span>
<span class="item"><a href="https://libraries.mit.edu/permissions" class="link-sub">Permissions</a></span>
<span class="item"><a href="https://libraries.mit.edu/accessibility" class="link-sub">Accessibility</a></span>
</nav>
</div>
</div>
</div><!-- end .identity -->
<div class="wrap-sitemap">
<nav class="sitemap-libraries-abbrev" aria-label="MIT Libraries site menu">
<h2 class="sr">MIT Libraries navigation</h2>
<a class="item" href="https://libraries.mit.edu/">Home</a>
<a class="item" href="https://libraries.mit.edu/search">Search</a>
<a class="item" href="https://libraries.mit.edu/hours">Hours &amp; locations</a>
<a class="item" href="https://libraries.mit.edu/borrow">Borrow &amp; request</a>
<a class="item" href="https://libraries.mit.edu/research-support">Research support</a>
<a class="item" href="https://libraries.mit.edu/about">About the Libraries</a>
</nav>
</div><!-- end .links-all -->
</div>
</div>
</div>
2 changes: 1 addition & 1 deletion lib/mitlibraries/theme/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module Mitlibraries
module Theme
VERSION = '0.3.3'.freeze
VERSION = '0.4.0'.freeze
end
end
4 changes: 2 additions & 2 deletions mitlibraries-theme.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
spec.require_paths = ['lib']

spec.add_development_dependency 'bundler', '~> 1.16'
spec.add_development_dependency 'bundler', '~> 2'
spec.add_development_dependency 'minitest', '~> 5.0'
spec.add_development_dependency 'rake', '~> 10.0'
spec.add_development_dependency "rake", ">= 12.3.3"
spec.add_dependency 'rails', '~> 5'
spec.add_dependency 'sass', '~> 3.4'
spec.add_dependency 'sass-rails', '~> 5'
Expand Down
26 changes: 22 additions & 4 deletions vendor/assets/stylesheets/elements/_footer.scss
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@
@extend %link;
color: $white;
text-decoration: none;

&:hover,
&:active,
&:focus {
text-decoration: underline;
color: $white;
}
}

.title {
Expand All @@ -37,7 +44,7 @@
}
}

.wrap-usergroups {
.wrap-policies {
@extend .list-inline-pipe;
font-size: $fs-small;
}
Expand Down Expand Up @@ -83,13 +90,23 @@
font-size: $fs-xxsmall;
color: $gray-l3;

.footer-info-institute {
display: flex;
justify-content: space-between;
align-items: baseline;
}

a {
@extend %link;
color: $white;
&:hover,
&:active,
&:focus {
color: $white;
}
}

.link-logo-mit {
display: inline-block;

.logo-mit {
fill: $gray-l2;
Expand All @@ -101,13 +118,14 @@
}

.about-mit {
@extend .list-inline-pipe;
display: inline-block;
color: $gray-l3;
margin-right: 4%;
text-transform: uppercase;
white-space: nowrap;
}

.license {
margin-left: auto;
margin-top: 1rem;
color: $gray-l3;
}
Expand Down
16 changes: 15 additions & 1 deletion vendor/assets/stylesheets/elements/_modules.scss
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@

.fa {
display: inline-block;
margin-right: .5em
margin-right: .5em;
}

&.success {
Expand All @@ -104,6 +104,20 @@
border-top: 5px solid $error;
color: $black-t;
}

&.privacy-notice {
position: fixed;
bottom: 40px;
left: 10%;
right: 10%;
width: 80%;
display: flex;
justify-content: space-between;
background-color: #eee;
p {
margin-right: .5em;
}
}
}

.inline-action {
Expand Down
Loading

0 comments on commit 908dfd4

Please sign in to comment.