Permalink
Browse files

Fix fonts. Add footer.

  • Loading branch information...
1 parent 9c572b2 commit 2de966d0a71643011f4b8dd3d75d029f75eb2d62 @judy committed Feb 9, 2014
View
19 app/views/layouts/application.html.haml
@@ -15,22 +15,7 @@
= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
= csrf_meta_tags
%body
- .navbar.navbar-fixed-top
- .navbar-inner
- .container
- %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
- %span.icon-bar
- %span.icon-bar
- %span.icon-bar
- = link_to @cms_site.pages.root.full_path, class: "brand goTop" do
- = image_tag "header-logo.png"
- .nav-collapse.pull-right
- %ul.nav
- %li{class: ("active" if current_page?(@cms_site.pages.root))}
- = link_to @cms_site.pages.root.label.upcase, @cms_site.pages.root.full_path
- - @cms_site.pages.root.children.published.each do |page|
- %li{class: ("active" if current_page?(page))}
- = link_to page.label.upcase, page.full_path
+ = render "shared/navbar"
= yield
-
+ = render "shared/footer"
= javascript_include_tag "application", "data-turbolinks-track" => true
View
99 app/views/shared/_footer.html.haml
@@ -0,0 +1,99 @@
+%footer
+ .light-bg
+ .container
+ .row-fluid
+ .span3
+ %h4 Get in touch
+ .info-block
+ %article.clearfix
+ %i.icon-globe
+ %address
+ 141 South Fraser St.
+ %br/
+ State College, Pennsylvania
+ %br/
+ 16801
+ %article.clearfix
+ %i.icon-phone
+ %p 814.689.3103
+ %article.clearfix
+ %i.icon-envelope
+ %p
+ %a{href: "mailto:root@makespace.io"} root@makespace.io
+ .span3
+ %h4 Follow us
+ .social
+ %ul.unstyled.clearfix
+ %li
+ %a{href: "https://twitter.com/TheMakeSpaceSC", target: "_blank", title: ""}
+ %i.icon-twitter
+ %li
+ %a{href: "https://www.facebook.com/hackvalley", target: "_blank", title: ""}
+ %i.icon-facebook
+ -# %li
+ -# %a{href: "#", target: "_blank", title: ""}
+ -# %i.icon-github
+ -# %li
+ -# %a{href: "#", target: "_blank", title: ""}
+ -# %i.icon-linkedin
+ -# %li
+ -# %a{href: "#", target: "_blank", title: ""}
+ -# %i.icon-pinterest
+ %li
+ %a{href: "https://plus.google.com/116879917434169348901/about?gl=US&hl=en-US", target: "_blank", title: ""}
+ %i.icon-google-plus
+ %li
+ %a{href: "http://hackerspaces.org/wiki/The_Make_Space", target: "_blank", title: "Our location on hackerspaces.org"}
+ %i.icon-gear
+ -# %li
+ -# %a{href: "#", target: "_blank", title: ""}
+ -# %i.icon-rss
+ .span3
+ %h4 Notable events
+ %ul.link-list
+ %li
+ %a{href: "#"} Dynamically created list of events coming soonish!
+ .span3
+ %h4 Photostream
+ %p We’re trying to remember to take pictures more frequently. We'll have stuff here at some point…
+ -# %ul.footer-thumbnails.unstyled.clearfix
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ -# %li.stream
+ -# %a{href: "#"}
+ -# %img{alt: "", src: "http://dummyimage.com/45x45/243135/fff"}/
+ .copyright-block.dark-bg.clearfix
+ .container
+ .row
+ .span1
+ %a{href: "http://creativecommons.org/licenses/by-sa/4.0/", rel: "license"}
+ %img{alt: "Creative Commons License", src: "http://i.creativecommons.org/l/by-sa/4.0/88x31.png", style: "border-width:0"}/
+ .span8
+ %p.pull-left
+ This work is licensed under a
+ %a{href: "http://creativecommons.org/licenses/by-sa/4.0/", rel: "license"} Creative Commons Attribution-ShareAlike 4.0 International License.
+ Except where we stole content without permission. Which we might have done by accident. Copyright is tricky. ;p
+
+
+ .span3
+ .pull-right
+ %p
View
16 app/views/shared/_navbar.html.haml
@@ -0,0 +1,16 @@
+.navbar.navbar-fixed-top
+ .navbar-inner
+ .container
+ %a.btn.btn-navbar{"data-target" => ".nav-collapse", "data-toggle" => "collapse"}
+ %span.icon-bar
+ %span.icon-bar
+ %span.icon-bar
+ = link_to @cms_site.pages.root.full_path, class: "brand goTop" do
+ = image_tag "header-logo.png"
+ .nav-collapse.pull-right
+ %ul.nav
+ %li{class: ("active" if current_page?(@cms_site.pages.root))}
+ = link_to @cms_site.pages.root.label.upcase, @cms_site.pages.root.full_path
+ - @cms_site.pages.root.children.published.each do |page|
+ %li{class: ("active" if current_page?(page))}
+ = link_to page.label.upcase, page.full_path
View
4 vendor/assets/stylesheets/font-awesome.min.sass
@@ -1,7 +1,7 @@
@font-face
font-family: 'FontAwesome'
- src: url('../font/fontawesome-webfont.eot?v=3.2.1')
- src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format("embedded-opentype"), url('../font/fontawesome-webfont.woff?v=3.2.1') format("woff"), url('../font/fontawesome-webfont.ttf?v=3.2.1') format("truetype"), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format("svg")
+ src: url('fontawesome-webfont.eot?v=3.2.1')
+ src: url('fontawesome-webfont.eot?#iefix&v=3.2.1') format("embedded-opentype"), url('fontawesome-webfont.woff?v=3.2.1') format("woff"), url('fontawesome-webfont.ttf?v=3.2.1') format("truetype"), url('fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format("svg")
font-weight: normal
font-style: normal

0 comments on commit 2de966d

Please sign in to comment.