Skip to content

Commit 908dfd4

Browse files
JPrevostJPrevost
authored
Merge pull request #12 from MITLibraries/footer_updates
Update footer
2 parents 0c5da35 + 79570e5 commit 908dfd4

10 files changed

Lines changed: 305 additions & 57 deletions

File tree

‎.travis.yml‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎Gemfile.lock‎

Lines changed: 146 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
PATH
2+
remote: .
3+
specs:
4+
mitlibraries-theme (0.4.0)
5+
rails (~> 5)
6+
sass (~> 3.4)
7+
sass-rails (~> 5)
8+
9+
GEM
10+
remote: https://rubygems.org/
11+
specs:
12+
actioncable (5.2.4.4)
13+
actionpack (= 5.2.4.4)
14+
nio4r (~> 2.0)
15+
websocket-driver (>= 0.6.1)
16+
actionmailer (5.2.4.4)
17+
actionpack (= 5.2.4.4)
18+
actionview (= 5.2.4.4)
19+
activejob (= 5.2.4.4)
20+
mail (~> 2.5, >= 2.5.4)
21+
rails-dom-testing (~> 2.0)
22+
actionpack (5.2.4.4)
23+
actionview (= 5.2.4.4)
24+
activesupport (= 5.2.4.4)
25+
rack (~> 2.0, >= 2.0.8)
26+
rack-test (>= 0.6.3)
27+
rails-dom-testing (~> 2.0)
28+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
29+
actionview (5.2.4.4)
30+
activesupport (= 5.2.4.4)
31+
builder (~> 3.1)
32+
erubi (~> 1.4)
33+
rails-dom-testing (~> 2.0)
34+
rails-html-sanitizer (~> 1.0, >= 1.0.3)
35+
activejob (5.2.4.4)
36+
activesupport (= 5.2.4.4)
37+
globalid (>= 0.3.6)
38+
activemodel (5.2.4.4)
39+
activesupport (= 5.2.4.4)
40+
activerecord (5.2.4.4)
41+
activemodel (= 5.2.4.4)
42+
activesupport (= 5.2.4.4)
43+
arel (>= 9.0)
44+
activestorage (5.2.4.4)
45+
actionpack (= 5.2.4.4)
46+
activerecord (= 5.2.4.4)
47+
marcel (~> 0.3.1)
48+
activesupport (5.2.4.4)
49+
concurrent-ruby (~> 1.0, >= 1.0.2)
50+
i18n (>= 0.7, < 2)
51+
minitest (~> 5.1)
52+
tzinfo (~> 1.1)
53+
arel (9.0.0)
54+
builder (3.2.4)
55+
concurrent-ruby (1.1.7)
56+
crass (1.0.6)
57+
erubi (1.9.0)
58+
ffi (1.13.1)
59+
globalid (0.4.2)
60+
activesupport (>= 4.2.0)
61+
i18n (1.8.5)
62+
concurrent-ruby (~> 1.0)
63+
loofah (2.7.0)
64+
crass (~> 1.0.2)
65+
nokogiri (>= 1.5.9)
66+
mail (2.7.1)
67+
mini_mime (>= 0.1.1)
68+
marcel (0.3.3)
69+
mimemagic (~> 0.3.2)
70+
method_source (1.0.0)
71+
mimemagic (0.3.5)
72+
mini_mime (1.0.2)
73+
mini_portile2 (2.4.0)
74+
minitest (5.14.2)
75+
nio4r (2.5.4)
76+
nokogiri (1.10.10)
77+
mini_portile2 (~> 2.4.0)
78+
rack (2.2.3)
79+
rack-test (1.1.0)
80+
rack (>= 1.0, < 3)
81+
rails (5.2.4.4)
82+
actioncable (= 5.2.4.4)
83+
actionmailer (= 5.2.4.4)
84+
actionpack (= 5.2.4.4)
85+
actionview (= 5.2.4.4)
86+
activejob (= 5.2.4.4)
87+
activemodel (= 5.2.4.4)
88+
activerecord (= 5.2.4.4)
89+
activestorage (= 5.2.4.4)
90+
activesupport (= 5.2.4.4)
91+
bundler (>= 1.3.0)
92+
railties (= 5.2.4.4)
93+
sprockets-rails (>= 2.0.0)
94+
rails-dom-testing (2.0.3)
95+
activesupport (>= 4.2.0)
96+
nokogiri (>= 1.6)
97+
rails-html-sanitizer (1.3.0)
98+
loofah (~> 2.3)
99+
railties (5.2.4.4)
100+
actionpack (= 5.2.4.4)
101+
activesupport (= 5.2.4.4)
102+
method_source
103+
rake (>= 0.8.7)
104+
thor (>= 0.19.0, < 2.0)
105+
rake (13.0.1)
106+
rb-fsevent (0.10.4)
107+
rb-inotify (0.10.1)
108+
ffi (~> 1.0)
109+
sass (3.7.4)
110+
sass-listen (~> 4.0.0)
111+
sass-listen (4.0.0)
112+
rb-fsevent (~> 0.9, >= 0.9.4)
113+
rb-inotify (~> 0.9, >= 0.9.7)
114+
sass-rails (5.1.0)
115+
railties (>= 5.2.0)
116+
sass (~> 3.1)
117+
sprockets (>= 2.8, < 4.0)
118+
sprockets-rails (>= 2.0, < 4.0)
119+
tilt (>= 1.1, < 3)
120+
sprockets (3.7.2)
121+
concurrent-ruby (~> 1.0)
122+
rack (> 1, < 3)
123+
sprockets-rails (3.2.2)
124+
actionpack (>= 4.0)
125+
activesupport (>= 4.0)
126+
sprockets (>= 3.0.0)
127+
thor (1.0.1)
128+
thread_safe (0.3.6)
129+
tilt (2.0.10)
130+
tzinfo (1.2.7)
131+
thread_safe (~> 0.1)
132+
websocket-driver (0.7.3)
133+
websocket-extensions (>= 0.1.0)
134+
websocket-extensions (0.1.5)
135+
136+
PLATFORMS
137+
ruby
138+
139+
DEPENDENCIES
140+
bundler (~> 2)
141+
minitest (~> 5.0)
142+
mitlibraries-theme!
143+
rake (>= 12.3.3)
144+
145+
BUNDLED WITH
146+
2.1.4

‎app/views/layouts/_institute_footer.html.erb‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
<div class="wrap-outer-footer-institute layout-band">
22
<div class="wrap-footer-institute">
3-
<div class="footer-info-institute">
4-
<a class="link-logo-mit" href="https://www.mit.edu" alt="Massachusetts Institute of Technology Logo">
3+
<footer class="footer-info-institute" aria-label="MIT footer" role="contentinfo">
4+
<a class="link-logo-mit" href="https://www.mit.edu">
55
<span class="sr">MIT</span>
6-
<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>
6+
<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>
77
</a>
88
<div class="about-mit">
99
<span class="item">Massachusetts Institute of Technology</span>
10-
<span class="item">77 Massachusetts Avenue</span>
11-
<span class="item">Cambridge MA 02139-4307</span>
1210
</div>
13-
<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>.
14-
</div><!-- end .footer-info-institute -->
15-
</div>
11+
<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>.
12+
</div>
13+
</footer><!-- end .footer-info-institute -->
1614
</div>
1715
</div>

‎app/views/layouts/_libraries_footer.html.erb‎

Lines changed: 46 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,53 @@
88
<%= image_tag("mitlib-wordmark.svg", :alt => "MIT Libraries logo") %>
99
</a>
1010
</div>
11+
<div class="wrap-social">
12+
<p class="text-find-us">Find us on</p>
13+
<a href="https://twitter.com/mitlibraries" title="Twitter">
14+
<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>
15+
<span class="sr">Twitter</span>
16+
</a><!-- End Twitter -->
17+
18+
<a href="https://www.facebook.com/mitlib" title="Facebook">
19+
<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>
20+
<span class="sr">Facebook</span>
21+
</a><!-- End Facebook -->
22+
23+
<a href="https://instagram.com/mitlibraries/" title="Instagram">
24+
<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>
25+
<span class="sr">Instagram</span>
26+
</a><!-- End Instagram -->
27+
28+
<a href="https://www.youtube.com/user/MITLibraries" title="YouTube">
29+
<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>
30+
<span class="sr">YouTube</span>
31+
</a><!-- End YouTube -->
32+
33+
<a href="https://libguides.mit.edu/mit-feeds" title="RSS">
34+
<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>
35+
<span class="sr">RSS</span>
36+
</a><!-- End RSS -->
37+
</div><!-- end .social -->
38+
<div class="wrap-middle">
39+
<div class="wrap-sitemap">
40+
<nav class="sitemap-libraries-abbrev" aria-label="MIT Libraries site menu">
41+
<h2 class="sr">MIT Libraries navigation</h2>
42+
<a class="item" href="https://libraries.mit.edu/search">Search</a>
43+
<a class="item" href="https://libraries.mit.edu/hours">Hours &amp; locations</a>
44+
<a class="item" href="https://libraries.mit.edu/borrow">Borrow &amp; request</a>
45+
<a class="item" href="https://libraries.mit.edu/research-support">Research support</a>
46+
<a class="item" href="https://libraries.mit.edu/about">About us</a>
47+
</nav>
48+
</div><!-- end .links-all -->
49+
<div class="wrap-policies">
50+
<nav aria-label="MIT Libraries policy menu">
51+
<span class="item"><a href="https://libraries.mit.edu/privacy" class="link-sub">Privacy</a></span>
52+
<span class="item"><a href="https://libraries.mit.edu/permissions" class="link-sub">Permissions</a></span>
53+
<span class="item"><a href="https://libraries.mit.edu/accessibility" class="link-sub">Accessibility</a></span>
54+
</nav>
55+
</div>
56+
</div>
1157
</div><!-- end .identity -->
12-
<div class="wrap-sitemap">
13-
<nav class="sitemap-libraries-abbrev" aria-label="MIT Libraries site menu">
14-
<h2 class="sr">MIT Libraries navigation</h2>
15-
<a class="item" href="https://libraries.mit.edu/">Home</a>
16-
<a class="item" href="https://libraries.mit.edu/search">Search</a>
17-
<a class="item" href="https://libraries.mit.edu/hours">Hours &amp; locations</a>
18-
<a class="item" href="https://libraries.mit.edu/borrow">Borrow &amp; request</a>
19-
<a class="item" href="https://libraries.mit.edu/research-support">Research support</a>
20-
<a class="item" href="https://libraries.mit.edu/about">About the Libraries</a>
21-
</nav>
22-
</div><!-- end .links-all -->
2358
</div>
2459
</div>
2560
</div>

‎lib/mitlibraries/theme/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Mitlibraries
22
module Theme
3-
VERSION = '0.3.3'.freeze
3+
VERSION = '0.4.0'.freeze
44
end
55
end

‎mitlibraries-theme.gemspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
2020
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2121
spec.require_paths = ['lib']
2222

23-
spec.add_development_dependency 'bundler', '~> 1.16'
23+
spec.add_development_dependency 'bundler', '~> 2'
2424
spec.add_development_dependency 'minitest', '~> 5.0'
25-
spec.add_development_dependency 'rake', '~> 10.0'
25+
spec.add_development_dependency "rake", ">= 12.3.3"
2626
spec.add_dependency 'rails', '~> 5'
2727
spec.add_dependency 'sass', '~> 3.4'
2828
spec.add_dependency 'sass-rails', '~> 5'

‎vendor/assets/stylesheets/elements/_footer.scss‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@
1313
@extend %link;
1414
color: $white;
1515
text-decoration: none;
16+
17+
&:hover,
18+
&:active,
19+
&:focus {
20+
text-decoration: underline;
21+
color: $white;
22+
}
1623
}
1724

1825
.title {
@@ -37,7 +44,7 @@
3744
}
3845
}
3946

40-
.wrap-usergroups {
47+
.wrap-policies {
4148
@extend .list-inline-pipe;
4249
font-size: $fs-small;
4350
}
@@ -83,13 +90,23 @@
8390
font-size: $fs-xxsmall;
8491
color: $gray-l3;
8592

93+
.footer-info-institute {
94+
display: flex;
95+
justify-content: space-between;
96+
align-items: baseline;
97+
}
98+
8699
a {
87100
@extend %link;
88101
color: $white;
102+
&:hover,
103+
&:active,
104+
&:focus {
105+
color: $white;
106+
}
89107
}
90108

91109
.link-logo-mit {
92-
display: inline-block;
93110

94111
.logo-mit {
95112
fill: $gray-l2;
@@ -101,13 +118,14 @@
101118
}
102119

103120
.about-mit {
104-
@extend .list-inline-pipe;
105-
display: inline-block;
106121
color: $gray-l3;
122+
margin-right: 4%;
107123
text-transform: uppercase;
124+
white-space: nowrap;
108125
}
109126

110127
.license {
128+
margin-left: auto;
111129
margin-top: 1rem;
112130
color: $gray-l3;
113131
}

‎vendor/assets/stylesheets/elements/_modules.scss‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484

8585
.fa {
8686
display: inline-block;
87-
margin-right: .5em
87+
margin-right: .5em;
8888
}
8989

9090
&.success {
@@ -104,6 +104,20 @@
104104
border-top: 5px solid $error;
105105
color: $black-t;
106106
}
107+
108+
&.privacy-notice {
109+
position: fixed;
110+
bottom: 40px;
111+
left: 10%;
112+
right: 10%;
113+
width: 80%;
114+
display: flex;
115+
justify-content: space-between;
116+
background-color: #eee;
117+
p {
118+
margin-right: .5em;
119+
}
120+
}
107121
}
108122

109123
.inline-action {

0 commit comments

Comments
 (0)