Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
  • Loading branch information...
commit 81d3cd8b22f149994d78936fd01567122199d204 2 parents d707186 + 3ec2727
@te-chris authored
View
5 source/dunedin.html.haml
@@ -9,4 +9,7 @@ title: Dunedin Labs
<iframe width="660" height="372" src="http://www.youtube.com/embed/G0OoIlcwTzU" frameborder="0" allowfullscreen></iframe>
%p After four years, all the original Distiller Lab residents at the Centre for Innovation have either grown up and moved out, or are now up at the Auckland Lab growing their startups.
%p This means that it’s time to usher in a new generation of Dunedin Distillerites. Are you looking to join a community of people starting up great companies here in Dunedin? Come join us!
- %p Register your interest by submitting your email address below, and we’ll get everyone together for an information evening so we can meet each other and develop a vision for how The Distiller can best help you ovesr the coming year.
+ %p Register your interest by submitting your email address below, and we’ll get everyone together for an information evening so we can meet each other and develop a vision for how The Distiller can best help you over the coming year.
+ .call-to-action
+ %a{:href=>'http://pocketsmith.wufoo.eu/forms/distiller-dunedin/', :target => '_blank'}
+ Yes I’m interested
View
BIN  source/images/favicon.ico
Binary file not shown
View
BIN  source/images/favicon.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
4 source/index.html.haml
@@ -18,7 +18,7 @@ title: Welcome
%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.
+ Found out more about our current <br/> startups in both cities.
%a.hero-network.hero-btn{:href=>"#network"}
%h3.hero-title-network
Network
@@ -42,6 +42,7 @@ title: Welcome
= link_to 'contact@thedistiller.org', 'mailto:contact@thedistiller.org'
%p
%p 87 St David St, North Dunedin, Dunedin 9016
+ %p +64 3 479 5275
%a.map{:href => "https://maps.google.co.nz/maps?q=87+st+david+st+dunedin&hl=en&ll=-45.863213,170.514533&spn=0.009055,0.016651&sll=-36.892442,174.682719&sspn=0.0104,0.016651&t=v&hnear=87+St+David+Street,+North+Dunedin,+Dunedin+9016&z=16", :target => '_blank'}
= image_tag 'map-dunedin.png'
.location.aucklandloc
@@ -50,6 +51,7 @@ title: Welcome
%p
= link_to 'contact@thedistiller.org', 'mailto:contact@thedistiller.org'
%p 385 Queent St, Auckland CBD, Auckland 1010
+ %p +64 9 373 9728
%a.map{:href => "https://maps.google.co.nz/maps?q=385+queen+st+auckland&hl=en&sll=-45.863213,170.514533&sspn=0.009055,0.016651&t=v&hnear=385+Queen+St,+Auckland,+1010&z=16", :target => '_blank'}
= image_tag 'map-auckland.png'
.startups.home-section.container#startups
View
14 source/shared/_footer.html.haml
@@ -1,4 +1,14 @@
.sponsors
.sponsor-divider
- %h4 Sponsors
- .logos
+ %h4 Sponsors & Supporters
+ .logos
+ %map{:name => 'sponsor-map'}
+ %area{:shape => 'rect', :coords => '93,12,205,112', :href => 'http://www.otago.ac.nz/', :alt => 'University of Otago', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '215,19,397,109', :href => 'http://www.business.otago.ac.nz/com/', :alt => 'University of Otago Business School', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '423,19,727,93', :href => 'http://www.otago.ac.nz/centreforinnovation/', :alt => 'University of Otago Centre for Innovation', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '110,143,267,215', :href => 'http://www.dunedin.govt.nz/', :alt => 'Dunedin City Council', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '300,147,524,213', :href => 'http://www.nzte.govt.nz/Pages/default.aspx', :alt => 'New Zealand Trade & Enterprise', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '555,141,743,215', :href => 'http://www.tindall.org.nz/', :alt => 'The Tindall Foundation', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '184,241,384,319', :href => 'http://www.otagopolytechnic.ac.nz/', :alt => 'Otago Polytechnic', :target => '_blank'}
+ %area{:shape => 'rect', :coords => '437,248,623,310', :href => 'http://www.oct.org.nz/', :alt => 'Otago Community Trust', :target => '_blank'}
+ = image_tag "sponsors.jpg", :width => '840px', :height => '354px', :usemap => "#sponsor-map"
View
2  source/shared/_head.html.haml
@@ -4,6 +4,8 @@
/ Use title if it's in the page YAML frontmatter
%title= data.page.title + " - The Distiller"
= stylesheet_link_tag 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700'
+= favicon_tag 'favicon.png'
+<link rel="shortcut icon" href="favicon.ico" />
= stylesheet_link_tag "all"
= javascript_include_tag "all"
:javascript
View
30 source/stylesheets/all.sass
@@ -49,7 +49,7 @@ h4
color: $font-color
font-size: 18px
.container
- width: 990px
+ width: 980px
margin: 0 auto
position: relative
header
@@ -71,6 +71,8 @@ header
.hero-menu
height: 570px
max-height: 800px
+ .hero-btns
+ width: 980px
.value-prop
padding: 113px 0 0
height: 316px
@@ -87,12 +89,12 @@ header
background-color: rgba(255,255,255,0.9)
text-align: center
cursor: pointer
- width: 320px
+ width: 314px
height: 58px
padding: 18px 0 34px 0
border-radius: 4px
float: left
- margin: 0 15px 0 0
+ margin-right: 19px
color: $font-color
@include single-box-shadow(rgba(0,0,0,0.2), 0px, 2px, 3px)
h3
@@ -127,19 +129,21 @@ header
top: 0
height: 55px
.fixed-nav-inner
- width: 990px
+ width: 980px
margin: 0 auto
height: 55px
a.hero-btn
background: white
border-radius: 0
box-shadow: none
- width: 330px
+ width: 314px
float: left
- margin: 0
+ margin: 0 19px 0 0
padding: 0
height: 50px
line-height: 50px
+ a.hero-btn.hero-network
+ margin: 0
h5
display: none
h3
@@ -270,7 +274,17 @@ ul.bullets
.sponsor-divider
background: image-url('footer-divider.png') 50% 0 no-repeat
.logos
- background: image-url('sponsors.jpg') 50% 0 no-repeat
width: 840px
height: 354px
- margin: 0 auto
+ margin: 0 auto
+
+.call-to-action
+ margin: 30px auto 0 auto
+ text-align: center
+ a
+ font-size: 20px
+ height: 40px
+ color: white
+ padding: 6px 16px
+ border-radius: 2px
+ background-color: $distiller-red
View
239 source/stylesheets/all.sass.orig
@@ -1,239 +0,0 @@
-@import "startups"
-@import "compass"
-@import reset.css
-
-$distiller-blue: rgb(74,166,255)
-$distiller-green: rgb(101,167,0)
-$distiller-red: rgb(237,64,64)
-$font-color: rgb(140,140,140)
-$link-hover-color: rgb(153, 205, 255)
-html
- font-family: 'Open Sans', sans-serif
- color: $font-color
- font-size: 14px
- line-height: 18px
- font-weight: 100
-body
- background: image-url('bg.jpg') 50% 0 no-repeat
-a
- text-decoration: none
- color: $distiller-blue
-a:hover
- color: $link-hover-color
-.clear
- clear: both
- height: 1px
-p
- line-height: 24px
- margin: 10px 0 0 0
-h1
- font-weight: 100
- line-height: 50px
- font-size: 30px
- margin: 0px
-h2
- line-height: 50px
- margin: 56px 0
- border-bottom: 1px solid #f0f0f0
- font-weight: 100
- line-height: 50px
- font-size: 30px
-h3
- clear: both
- margin: 60px 0 30px 0
- color: $font-color
- font-size: 22px
-h4
- padding: 30px 0
- color: $font-color
- font-size: 18px
-.container
- width: 990px
- margin: 0 auto
- position: relative
-header
- background: image-url('bg.jpg') 50% 0 no-repeat
-.navbar
- background: rgba(0,0,0,0.4)
- height: 70px
- line-height: 70px
- h1
- line-height: 70px
- margin: 0
- color: white
- float: left
- .menu
- float: right
- a
- padding: 0 12px
- color: white
-.hero-menu
- height: 570px
- .value-prop
- padding: 113px 0 0
- height: 316px
- h1
- color: white
- text-shadow: 0 1px 6px #333
- width: 540px
- a.hero-btn
- background-color: rgba(255,255,255,0.9)
- text-align: center
- cursor: pointer
- width: 320px
- height: 58px
- padding: 18px 0 34px 0
- border-radius: 4px
- float: left
- margin: 0 15px 0 0
- color: $font-color
- @include single-box-shadow(rgba(0,0,0,0.2), 0px, 2px, 3px)
- h3
- font-size: 19px
- color: rgb(51,51,51)
- background: image-url("spr-headers.png") 0 0 no-repeat
- line-height: 26px
- display: inline
- padding-left: 42px
- margin-left: -42px
- h3.hero-title-labs
- color: $distiller-blue
- h3.hero-title-startups
- color: $distiller-green
- background-position: 0 -26px
- h3.hero-title-network
- color: $distiller-red
- background-position: 0 -52px
- h5
- font-size: 14px
- color: rgb(102,102,102)
- line-height: 18px
- margin: 10px 0 0
- 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
- margin: 0
-.main-content
- background: white
- padding-bottom: 120px
- .container
- clear: both
- width: 660px
- padding: 0 40px
- h2
- margin: 0 -40px
-.home-section
- h2
- background: image-url('spr-section-logos.png') 100% 0 no-repeat
-.labs
- h2
- margin-top: 56px
- color: $distiller-blue
- h3
- color: $distiller-blue
-.startups
- h2
- margin: 240px -40px 56px
- color: $distiller-green
- background-position: 100% -50px
- h3
- color: $distiller-green
-.network
- h2
- margin-top: 240px
- color: $distiller-red
- background-position: 100% -100px
- h3
- color: $distiller-red
- p.network-initial
- margin-top: 60px
-.sponsors
- text-align: center
- background: image-url('footer-divider.png') 50% 0 no-repeat
- height: 200px
- width: 840px
- margin: 140px auto 0 auto
- .logos
- background: image-url('sponsors.jpg') 50% 0 no-repeat
- width: 840px
- height: 354px
-.alumni-container
- @include clearfix
- p
- width: 220px
-#startups
- width: 680px
- ul
- width: 30%
- float: left
- li
- padding: 6px 0
-.startups-smashbox
- float: left
- width: 150px
- margin: 0 20px 18px 0
- text-align: center
- .starup-image
- width: 150px
- height: 150px
- background: #f5f5f5
- border-radius: 7px
- text-align: center
- img
- margin: auto auto
-
-<<<<<<< HEAD
-ul.bullets
- margin-left: 10px
- list-style-type: disc
- padding-left: 18px
- padding-bottom: 10px
- li
- margin-top: 8px
-=======
-
-#all-startups
- margin-bottom: 0px
-
-
-.list-container
- @include clearfix
- ul
- width: 220px
- float: left
- li
- padding: 6px 0
- #alumni-startups
- width: 60%
- float: left
-
- #current-startups
- width: 30%
- float: left
->>>>>>> 9bd57db78e15d813bd8cdea32c105e0b8f4a75a4
Please sign in to comment.
Something went wrong with that request. Please try again.