Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: te-chris/distiller-site
base: 002319331a
...
head fork: te-chris/distiller-site
compare: 365ac5c78f
  • 2 commits
  • 10 files changed
  • 0 commit comments
  • 1 contributor
View
2  Gemfile
@@ -5,3 +5,5 @@ source 'http://rubygems.org'
gem "middleman", "~>3.0.12"
gem "heroku"
+
+gem "susy"
View
4 Gemfile.lock
@@ -101,6 +101,9 @@ GEM
sprockets-sass (0.9.1)
sprockets (~> 2.0)
tilt (~> 1.1)
+ susy (1.0.5)
+ compass (>= 0.12.2)
+ sass (>= 3.2.0)
syntax (1.0.0)
thor (0.15.4)
tilt (1.3.5)
@@ -116,3 +119,4 @@ PLATFORMS
DEPENDENCIES
heroku
middleman (~> 3.0.12)
+ susy
View
10 source/index.html.erb
@@ -1,10 +0,0 @@
----
-title: Welcome to Middleman
----
-
-<div class="welcome">
- <h1>Middleman is Watching</h1>
- <p class="doc">
- <%= link_to "Read Online Documentation", "http://middlemanapp.com/" %>
- </p><!-- .doc -->
-</div><!-- .welcome -->
View
7 source/index.html.haml
@@ -0,0 +1,7 @@
+---
+title: Welcome to Middleman
+---
+.left
+ %p left
+.right
+ %p right
View
19 source/layouts/layout.erb
@@ -1,19 +0,0 @@
-<!doctype html>
-<html>
- <head>
- <meta charset="utf-8">
-
- <!-- Always force latest IE rendering engine or request Chrome Frame -->
- <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 Middleman" %></title>
-
- <%= stylesheet_link_tag "normalize", "all" %>
- <%= javascript_include_tag "all" %>
- </head>
-
- <body class="<%= page_classes %>">
- <%= yield %>
- </body>
-</html>
View
15 source/layouts/layout.html.haml
@@ -0,0 +1,15 @@
+!!!
+%html
+ %head
+ %meta{:charset => "utf-8"}/
+ / Always force latest IE rendering engine or request Chrome Frame
+ %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 "normalize", "all"
+ = javascript_include_tag "all"
+ %body{:class => page_classes}
+ %header
+ = partial 'shared/nav'
+ .container
+ = yield
View
1  source/shared/_nav.html.haml
@@ -0,0 +1 @@
+%h1 here be nav
View
12 source/stylesheets/_defaults.scss
@@ -0,0 +1,12 @@
+//compass vertical rhythm
+
+$base-font-size: 16px;
+
+$base-line-height: 24px;
+
+//susy grid settings
+
+$total-cols: 12;
+$column-width: 4em;
+$gutter-width: 1em;
+$grid-padding: 1em;
View
55 source/stylesheets/all.css
@@ -1,55 +0,0 @@
-@charset "utf-8";
-
-body {
- background: #d4d4d4 url("../images/background.png");
- text-align: center;
- font-family: sans-serif; }
-
-h1 {
- color: rgba(0, 0, 0, .3);
- font-weight: bold;
- font-size: 32px;
- letter-spacing: -1px;
- text-transform: uppercase;
- text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
- background: url("../images/middleman.png") no-repeat center 100px;
- padding: 350px 0 10px;
- margin: 0; }
-
-.doc {
- font-size: 14px;
- margin: 0; }
- .doc:before,
- .doc:after {
- opacity: .2;
- padding: 6px;
- font-style: normal;
- position: relative;
- content: ""; }
- .doc a {
- color: rgba(0, 0, 0, 0.3); }
- .doc a:hover {
- color: #666; }
-
-.welcome {
- -webkit-animation-name: welcome;
- -webkit-animation-duration: .9s; }
-
-@-webkit-keyframes welcome {
- from {
- -webkit-transform: scale(0);
- opacity: 0;
- }
- 50% {
- -webkit-transform: scale(0);
- opacity: 0;
- }
- 82.5% {
- -webkit-transform: scale(1.03);
- -webkit-animation-timing-function: ease-out;
- opacity: 1;
- }
- to {
- -webkit-transform: scale(1);
- }
-}
View
21 source/stylesheets/all.scss
@@ -0,0 +1,21 @@
+@import "compass";
+@import "defaults";
+@import "susy";
+
+//setup vertical rhythm
+@include establish-baseline;
+
+.container{
+ @include container;
+
+ .left {
+ @include span-columns(3,12);
+ background-color: red;
+ }
+
+ .right {
+ @include span-columns(9 omega, 12);
+ background-color: blue;
+ }
+}
+

No commit comments for this range

Something went wrong with that request. Please try again.