Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Updates to Gemfile versions and removal of Grid Coordinates

  • Loading branch information...
commit 8cc0ab602d6c18a10c5683440437411543cc9b04 1 parent 8b15c16
Adam Stacoviak authored
13 Gemfile
View
@@ -1,12 +1,11 @@
source :rubygems
-gem 'serve', '~> 1.5.1'
-gem 'haml', '~> 3.1.3'
-gem 'sass', '~> 3.1.7'
-gem 'compass', '~> 0.11.5'
-gem 'css_parser', '~> 1.2.5'
-gem 'grid-coordinates', '~> 1.1.5'
-gem 'maruku', '~> 0.6.0'
+gem 'serve'
+gem 'haml'
+gem 'sass'
+gem 'compass'
+gem 'css_parser'
+gem 'maruku'
group :development do
gem 'heroku'
54 Gemfile.lock
View
@@ -1,39 +1,43 @@
GEM
remote: http://rubygems.org/
specs:
- activesupport (3.1.0)
+ activesupport (3.2.3)
+ i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.6)
- chunky_png (1.2.1)
- compass (0.11.5)
+ addressable (2.2.8)
+ chunky_png (1.2.5)
+ compass (0.12.1)
chunky_png (~> 1.2)
fssm (>= 0.2.7)
sass (~> 3.1)
- css_parser (1.2.5)
+ css_parser (1.2.6)
addressable
- fssm (0.2.7)
- grid-coordinates (1.1.5)
- compass (>= 0.11.5)
- haml (3.1.3)
- heroku (2.7.0)
+ rdoc
+ fssm (0.2.9)
+ haml (3.1.5)
+ heroku (2.25.0)
launchy (>= 0.3.2)
+ netrc (~> 0.7.1)
rest-client (~> 1.6.1)
rubyzip
- term-ansicolor (~> 1.0.5)
i18n (0.6.0)
- launchy (2.0.5)
+ json (1.7.3)
+ launchy (2.1.0)
addressable (~> 2.2.6)
maruku (0.6.0)
syntax (>= 1.0.0)
- mime-types (1.16)
- multi_json (1.0.3)
- rack (1.3.2)
+ mime-types (1.18)
+ multi_json (1.3.5)
+ netrc (0.7.1)
+ rack (1.4.1)
rack-test (0.6.1)
rack (>= 1.0)
+ rdoc (3.12)
+ json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
- rubyzip (0.9.4)
- sass (3.1.7)
+ rubyzip (0.9.8)
+ sass (3.1.18)
serve (1.5.1)
activesupport (~> 3.0)
i18n
@@ -42,19 +46,17 @@ GEM
tilt (~> 1.3)
tzinfo
syntax (1.0.0)
- term-ansicolor (1.0.6)
tilt (1.3.3)
- tzinfo (0.3.29)
+ tzinfo (0.3.33)
PLATFORMS
ruby
DEPENDENCIES
- compass (~> 0.11.5)
- css_parser (~> 1.2.5)
- grid-coordinates (~> 1.1.5)
- haml (~> 3.1.3)
+ compass
+ css_parser
+ haml
heroku
- maruku (~> 0.6.0)
- sass (~> 3.1.7)
- serve (~> 1.5.1)
+ maruku
+ sass
+ serve
2  config.rb
View
@@ -1,7 +1,5 @@
# Compass Configuration
-require 'grid-coordinates'
-
# HTTP paths
http_path = '/'
http_stylesheets_path = '/stylesheets'
507 public/stylesheets/stylesheet.css
View
@@ -174,15 +174,13 @@ input, select, textarea {
}
input:invalid, textarea:invalid {
- -moz-border-radius: 1px;
-webkit-border-radius: 1px;
- -o-border-radius: 1px;
+ -moz-border-radius: 1px;
-ms-border-radius: 1px;
- -khtml-border-radius: 1px;
+ -o-border-radius: 1px;
border-radius: 1px;
- -moz-box-shadow: red 0px 0px 5px;
-webkit-box-shadow: red 0px 0px 5px;
- -o-box-shadow: red 0px 0px 5px;
+ -moz-box-shadow: red 0px 0px 5px;
box-shadow: red 0px 0px 5px;
}
@@ -267,504 +265,9 @@ h1, h2, h3, h4, h5, h6 {
clear: both;
}
-.grid-pie-clearfix, .grid-container, .container, .nested-grid-container, .grid-block, .grid-full, .grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .container .content, p.last, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 {
- *zoom: 1;
-}
-.grid-pie-clearfix:after, .grid-container:after, .container:after, .nested-grid-container:after, .grid-block:after, .grid-full:after, .grid-1:after, .grid-2:after, .grid-3:after, .grid-4:after, .grid-5:after, .grid-6:after, .grid-7:after, .grid-8:after, .grid-9:after, .grid-10:after, .grid-11:after, .grid-12:after, .grid-13:after, .grid-14:after, .grid-15:after, .grid-16:after, .container .content:after, p.last:after, .grid-17:after, .grid-18:after, .grid-19:after, .grid-20:after, .grid-21:after, .grid-22:after, .grid-23:after, .grid-24:after {
- content: "";
- display: table;
- clear: both;
-}
-
-.grid-container, .container {
+.container .content {
margin: 0 auto;
- width: 960px;
-}
-
-.nested-grid-container {
- display: inline-block;
- margin-left: -5px;
- margin-right: -5px;
- width: auto;
-}
-
-.grid-block, .grid-full, .grid-1, .grid-2, .grid-3, .grid-4, .grid-5, .grid-6, .grid-7, .grid-8, .grid-9, .grid-10, .grid-11, .grid-12, .grid-13, .grid-14, .grid-15, .grid-16, .container .content, p.last, .grid-17, .grid-18, .grid-19, .grid-20, .grid-21, .grid-22, .grid-23, .grid-24 {
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- display: inline;
- float: left;
- position: relative;
- margin: 0 5px;
-}
-
-.grid-full {
- width: 950px;
-}
-
-.grid-1 {
- width: 30px;
-}
-
-.grid-2 {
- width: 70px;
-}
-
-.grid-3 {
- width: 110px;
-}
-
-.grid-4 {
- width: 150px;
-}
-
-.grid-5 {
- width: 190px;
-}
-
-.grid-6 {
- width: 230px;
-}
-
-.grid-7 {
- width: 270px;
-}
-
-.grid-8 {
- width: 310px;
-}
-
-.grid-9 {
- width: 350px;
-}
-
-.grid-10 {
- width: 390px;
-}
-
-.grid-11 {
- width: 430px;
-}
-
-.grid-12 {
- width: 470px;
-}
-
-.grid-13 {
- width: 510px;
-}
-
-.grid-14 {
- width: 550px;
-}
-
-.grid-15 {
- width: 590px;
-}
-
-.grid-16, .container .content, p.last {
- width: 630px;
-}
-
-.grid-17 {
- width: 670px;
-}
-
-.grid-18 {
- width: 710px;
-}
-
-.grid-19 {
- width: 750px;
-}
-
-.grid-20 {
- width: 790px;
-}
-
-.grid-21 {
- width: 830px;
-}
-
-.grid-22 {
- width: 870px;
-}
-
-.grid-23 {
- width: 910px;
-}
-
-.grid-24 {
- width: 950px;
-}
-
-.grid-prefix-1 {
- margin-left: 45px;
-}
-
-.grid-prefix-2 {
- margin-left: 85px;
-}
-
-.grid-prefix-3 {
- margin-left: 125px;
-}
-
-.grid-prefix-4, .container .content, p.last {
- margin-left: 165px;
-}
-
-.grid-prefix-5 {
- margin-left: 205px;
-}
-
-.grid-prefix-6 {
- margin-left: 245px;
-}
-
-.grid-prefix-7 {
- margin-left: 285px;
-}
-
-.grid-prefix-8 {
- margin-left: 325px;
-}
-
-.grid-prefix-9 {
- margin-left: 365px;
-}
-
-.grid-prefix-10 {
- margin-left: 405px;
-}
-
-.grid-prefix-11 {
- margin-left: 445px;
-}
-
-.grid-prefix-12 {
- margin-left: 485px;
-}
-
-.grid-prefix-13 {
- margin-left: 525px;
-}
-
-.grid-prefix-14 {
- margin-left: 565px;
-}
-
-.grid-prefix-15 {
- margin-left: 605px;
-}
-
-.grid-prefix-16 {
- margin-left: 645px;
-}
-
-.grid-prefix-17 {
- margin-left: 685px;
-}
-
-.grid-prefix-18 {
- margin-left: 725px;
-}
-
-.grid-prefix-19 {
- margin-left: 765px;
-}
-
-.grid-prefix-20 {
- margin-left: 805px;
-}
-
-.grid-prefix-21 {
- margin-left: 845px;
-}
-
-.grid-prefix-22 {
- margin-left: 885px;
-}
-
-.grid-prefix-23 {
- margin-left: 925px;
-}
-
-.grid-suffix-1 {
- margin-right: 45px;
-}
-
-.grid-suffix-2 {
- margin-right: 85px;
-}
-
-.grid-suffix-3 {
- margin-right: 125px;
-}
-
-.grid-suffix-4, .container .content, p.last {
- margin-right: 165px;
-}
-
-.grid-suffix-5 {
- margin-right: 205px;
-}
-
-.grid-suffix-6 {
- margin-right: 245px;
-}
-
-.grid-suffix-7 {
- margin-right: 285px;
-}
-
-.grid-suffix-8 {
- margin-right: 325px;
-}
-
-.grid-suffix-9 {
- margin-right: 365px;
-}
-
-.grid-suffix-10 {
- margin-right: 405px;
-}
-
-.grid-suffix-11 {
- margin-right: 445px;
-}
-
-.grid-suffix-12 {
- margin-right: 485px;
-}
-
-.grid-suffix-13 {
- margin-right: 525px;
-}
-
-.grid-suffix-14 {
- margin-right: 565px;
-}
-
-.grid-suffix-15 {
- margin-right: 605px;
-}
-
-.grid-suffix-16 {
- margin-right: 645px;
-}
-
-.grid-suffix-17 {
- margin-right: 685px;
-}
-
-.grid-suffix-18 {
- margin-right: 725px;
-}
-
-.grid-suffix-19 {
- margin-right: 765px;
-}
-
-.grid-suffix-20 {
- margin-right: 805px;
-}
-
-.grid-suffix-21 {
- margin-right: 845px;
-}
-
-.grid-suffix-22 {
- margin-right: 885px;
-}
-
-.grid-suffix-23 {
- margin-right: 925px;
-}
-
-.grid-push-1 {
- left: 40px;
-}
-
-.grid-push-2 {
- left: 80px;
-}
-
-.grid-push-3 {
- left: 120px;
-}
-
-.grid-push-4 {
- left: 160px;
-}
-
-.grid-push-5 {
- left: 200px;
-}
-
-.grid-push-6 {
- left: 240px;
-}
-
-.grid-push-7 {
- left: 280px;
-}
-
-.grid-push-8 {
- left: 320px;
-}
-
-.grid-push-9 {
- left: 360px;
-}
-
-.grid-push-10 {
- left: 400px;
-}
-
-.grid-push-11 {
- left: 440px;
-}
-
-.grid-push-12 {
- left: 480px;
-}
-
-.grid-push-13 {
- left: 520px;
-}
-
-.grid-push-14 {
- left: 560px;
-}
-
-.grid-push-15 {
- left: 600px;
-}
-
-.grid-push-16 {
- left: 640px;
-}
-
-.grid-push-17 {
- left: 680px;
-}
-
-.grid-push-18 {
- left: 720px;
-}
-
-.grid-push-19 {
- left: 760px;
-}
-
-.grid-push-20 {
- left: 800px;
-}
-
-.grid-push-21 {
- left: 840px;
-}
-
-.grid-push-22 {
- left: 880px;
-}
-
-.grid-push-23 {
- left: 920px;
-}
-
-.grid-pull-1 {
- left: -20px;
-}
-
-.grid-pull-2 {
- left: -40px;
-}
-
-.grid-pull-3 {
- left: -60px;
-}
-
-.grid-pull-4 {
- left: -80px;
-}
-
-.grid-pull-5 {
- left: -100px;
-}
-
-.grid-pull-6 {
- left: -120px;
-}
-
-.grid-pull-7 {
- left: -140px;
-}
-
-.grid-pull-8 {
- left: -160px;
-}
-
-.grid-pull-9 {
- left: -180px;
-}
-
-.grid-pull-10 {
- left: -200px;
-}
-
-.grid-pull-11 {
- left: -220px;
-}
-
-.grid-pull-12 {
- left: -240px;
-}
-
-.grid-pull-13 {
- left: -260px;
-}
-
-.grid-pull-14 {
- left: -280px;
-}
-
-.grid-pull-15 {
- left: -300px;
-}
-
-.grid-pull-16 {
- left: -320px;
-}
-
-.grid-pull-17 {
- left: -340px;
-}
-
-.grid-pull-18 {
- left: -360px;
-}
-
-.grid-pull-19 {
- left: -380px;
-}
-
-.grid-pull-20 {
- left: -400px;
-}
-
-.grid-pull-21 {
- left: -420px;
-}
-
-.grid-pull-22 {
- left: -440px;
-}
-
-.grid-pull-23 {
- left: -460px;
+ width: 600px;
}
body {
4 sass/_base.sass
View
@@ -2,9 +2,7 @@
@import compass/reset
// Compass Stuff
-@import compass/utilities
-@import compass/layout
-@import compass/css3
+@import compass
// Partials
@import partials/color
19 sass/stylesheet.sass
View
@@ -1,20 +1,9 @@
@import base
-// Configure grid coordinates
-$grid-columns: 24
-$grid-width: 30px
-$grid-gutter-width: 10px
-
-@import grid-coordinates
-
-+grid-coordinates
-
.container
- @extend .grid-container
.content
- @extend .grid-16
- @extend .grid-prefix-4
- @extend .grid-suffix-4
+ margin: 0 auto
+ width: 600px
body
@extend .font-helvetica
@@ -33,10 +22,6 @@ p
margin-bottom: 14px
&:last-child
margin-bottom: 0
- &.last
- @extend .grid-16
- @extend .grid-prefix-4
- @extend .grid-suffix-4
ul
list-style: disc
Please sign in to comment.
Something went wrong with that request. Please try again.