Permalink
Browse files

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

  • Loading branch information...
2 parents ead6626 + bdb15c0 commit 0350ed2291d94e2aca80af1694e89911be6951ac @te-chris committed Mar 16, 2013
Showing with 98 additions and 12 deletions.
  1. +39 −1 source/index.html.haml
  2. +1 −1 source/layouts/layout.html.haml
  3. +58 −10 source/stylesheets/all.sass
View
@@ -33,5 +33,43 @@ title: Welcome to Middleman
.dividing-line
.section-body
+ %h3 Free collaborative enviroments in Auckland & Dunedin
%p Core to how The Distiller operates are The Startup Sprints, which is an evolving framework modelled on successful startup and software development methodologies. The Sprints are applied as a part of The Distiller's free incubator model, in which peer governance and collaboration are the tenets of business development.
- %p Startups at The Distiller get access to the Labs, which are collaborative spaces in Dunedin and Auckland. Sprints are held every two weeks which keeps everyone accountable for each other’s success.
+ %p Startups at The Distiller get access to the Labs, which are collaborative spaces in Dunedin and Auckland. Sprints are held every two weeks which keeps everyone accountable for each other’s success.
+
+ .section-body
+ %h3 Get in touch with the Distiller
+
+ .contact-dunedin
+ .address
+ %h4 Dunedin
+ %p dunedin@thedistiller.co.nz <br/> 87 St David St, North Dunedin, Dunedin 9016
+ .map
+
+ .contact-auckland
+ .address
+ %h4 Auckland
+ %p auckland@thedistiller.co.nz <br/> 385 Queen Street, Auckland 1010
+ .map
+
+ .startups.home-section
+ .section-title
+ %h2 Our Startups
+
+ .section-logo
+
+ .dividing-line
+
+ .section-body
+ .startup-logo
+ .popin-logo
+
+ .network.home-section
+ .section-title
+ %h2 Network
+
+ .section-logo
+
+ .dividing-line
+
+ .section-body
@@ -6,7 +6,7 @@
%meta{:content => "IE=edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
/ 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=Roboto:400,100,300,700,100italic,300italic,400italic,700italic|Open+Sans:300italic,400italic,700italic,400,300,700'
+ = stylesheet_link_tag 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,700italic,400,300,700'
= stylesheet_link_tag "normalize", "all"
= javascript_include_tag "all"
@@ -98,34 +98,66 @@ h5.hero-description
@include span-columns(4 omega,12)
.main-content
- margin-top: 30px
+ margin-top: 100px
.labs
.section-title
color: $distiller-blue
+ .section-body
+ h3
+ color: $distiller-blue
+
+ .startups
+ .section-title
+ color: $distiller-green
+ .section-logo
+ background-position: 0 -36px
+ .section-body
+
+ .network
+ .section-title
+ color: $distiller-red
+ .section-logo
+ background-position: 0 -72px
+ .section-body
+ h3
+ color: $distiller-red
+
+.startup-logo
+ background-color: rgb(245,245,245)
.home-section
- width: 660px
- margin-left: auto
- margin-right: auto
+ width: 740px
+ margin: 0 auto 240px auto
.section-title
float: left
+ margin-bottom: 4px
+
+.section-body
+ padding: 0 40px
+ margin-top: 60px
.section-logo
background: image-url('spr-section-logos.png') 0 0 no-repeat
width: 30px
- height: 30px
+ height: 34px
float: right
.dividing-line
width: 100%
background-color: rgb(240,240,240)
height: 1px
margin-top: 13px
- margin-bottom: 60px
clear: both
+.contact-dunedin
+ .map
+
+.contact-auckland
+ .map
+
+
@@ -145,15 +177,31 @@ h2
font-size: 30px
margin: 0px
-p
+h3
font-family: 'Open Sans', sans-serif
font-weight: 100
+ line-height: 20px
+ font-size: 22px
+ margin: 0px
+ margin-bottom: 20px
+
+h4
+ font-family: 'Open Sans', sans-serif
+ font-weight: 400
+ line-height: 20px
font-size: 15px
- color: rgb(130,130,130)
- line-height: 18px
+ margin: 0px
+ margin-bottom: 10px
+ color: rgb(80,80,80)
+
+p
+ font-family: 'Open Sans', sans-serif
+ font-weight: 100
+ font-size: 14px
+ color: rgb(140,140,140)
+ line-height: 25px
margin-top: 10px
margin-bottom: 0px
- padding: 0px 15px
a
color: rgb(74,166,255)

0 comments on commit 0350ed2

Please sign in to comment.