Permalink
Browse files

Merge branch 'master' of github.com:te-chris/distiller-site

  • Loading branch information...
2 parents cf8299a + 425cc08 commit d270730cd2f352abe79fae9759ba2ff88cd49879 @te-chris committed Mar 16, 2013
View

Large diffs are not rendered by default.

Oops, something went wrong.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
@@ -7,22 +7,23 @@ title: Welcome to Middleman
The Distiller helps tech startups achieve growth through collaboration, sharing, and support from the community.
%br/
= link_to 'Get involved.', '/contact'
- .hero-btns.container
- %a.hero-labs.hero-btn{:href=>"#"}
- %h3.hero-title-labs
- Labs
- %h5.hero-description
- Shared creative spaces for startups in both Auckland and Dunedin.
- %a.hero-startups.hero-btn{:href=>"#"}
- %h3.hero-title.hero-title-startups
- Startups
- %h5.hero-description
- Our labs have 21 current startups in both cities. Find out more about them here.
- %a.hero-network.hero-btn{:href=>"#"}
- %h3.hero-title-network
- Network
- %h5.hero-description
- Find out about our broad network of entrepreneurs, backers and more.
+ .hero-btns.container#fix-nav
+ .fixed-nav-inner
+ %a.hero-labs.hero-btn{:href=>"#"}
+ %h3.hero-title-labs
+ Labs
+ %h5.hero-description
+ Shared creative spaces for startups in both Auckland and Dunedin.
+ %a.hero-startups.hero-btn{:href=>"#"}
+ %h3.hero-title.hero-title-startups
+ Startups
+ %h5.hero-description
+ Our labs have 21 current startups in both cities. Find out more about them here.
+ %a.hero-network.hero-btn{:href=>"#"}
+ %h3.hero-title-network
+ Network
+ %h5.hero-description
+ Find out about our broad network of entrepreneurs, backers and more.
.main-content
.labs.home-section.container
.clear
@@ -33,14 +34,17 @@ title: Welcome to Middleman
%h3 Get in touch with The Distiller
.location
%h4 Dunedin
- %p dunedin@thedistiller.co.nz
- %address 87 St David St, North Dunedin, Dunedin 9016
+ %p
+ = link_to 'dunedin@thedistiller.co.nz', 'dunedin@thedistiller.co.nz'
+ %p
+ %p 87 St David St, North Dunedin, Dunedin 9016
.map
Google Map Here
.location
%h4 Auckland
- %p auckland@thedistiller.co.nz
- %address 87 St David St, North Dunedin, Dunedin 9016
+ %p
+ = link_to 'auckland@thedistiller.co.nz', 'auckland@thedistiller.co.nz'
+ %p 87 St David St, North Dunedin, Dunedin 9016
.map
Google Map Here
.startups.home-section.container
View
@@ -23,4 +23,20 @@ $(document).ready(function () {
// var windowHeight = $(window).height();
// var windowWidth = $(window).width();
// }
+});
+
+$(function(){
+ var scroll_anchors = []
+ $('#fix-nav').find('a').each(function(){
+ scroll_anchors.push($(this).attr('href').hash);
+ console.log(scroll_anchors);
+ });
+ $(window).scroll(function(){
+ if (($(this).scrollTop() > 640) && (!$('#fix-nav').hasClass('fixed-nav'))) {
+ $('#fix-nav').addClass('fixed-nav');
+ }
+ if (($(this).scrollTop() <= 640) && ($('#fix-nav').hasClass('fixed-nav'))) {
+ $('#fix-nav').removeClass('fixed-nav');
+ }
+ });
});
@@ -1,3 +1,5 @@
.sponsors
%h4 Sponsors
+ %a{:href=>"#"}
+ = image_tag 'sponsors/centre-for-innovation.gif'
.logos
@@ -109,6 +109,29 @@ h4
padding: 0px 15px
a.hero-btn:hover
background-color: white
+ .fixed-nav
+ z-index: 80
+ background: white image-url('bg-fixed-nav.png') 0 2px repeat-x
+ width: 100%
+ position: fixed
+ top: 0
+ height: 55px
+ .fixed-nav-inner
+ width: 990px
+ margin: 0 auto
+ height: 55px
+ a.hero-btn
+ background: white
+ border-radius: 0
+ box-shadow: none
+ width: 330px
+ float: left
+ margin: 0
+ padding: 0
+ height: 50px
+ line-height: 50px
+ h5
+ display: none
h3
margin: 0
a.hero-network
@@ -153,4 +176,4 @@ h4
.logos
background: image-url('sponsors.jpg') 50% 0 no-repeat
width: 840px
- height: 354px
+ height: 354px

0 comments on commit d270730

Please sign in to comment.