Skip to content
Browse files

Updated to Haml 3.1.1, Sass 3.1.1 and Compass 0.11.11, updated Gemfil…

…e. Bug fix: updated require paths for Ruby 1.9.2
  • Loading branch information...
1 parent 23081cd commit 05a73e53fc7d38f080a4ed3993a86654b4ff2bef @adamstac committed Jun 1, 2011
Showing with 134 additions and 14 deletions.
  1. +1 −0 .rvmrc
  2. +3 −2 Gemfile
  3. +14 −8 Gemfile.lock
  4. +1 −1 app.rb
  5. +1 −1 config.rb
  6. +1 −1 config.ru
  7. +113 −1 public/stylesheets/application.css
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm use ruby-1.9.2@sinatra-bootstrap
View
5 Gemfile
@@ -2,7 +2,8 @@ source "http://rubygems.org"
gem "sinatra", "~> 1.2.3"
gem "shotgun", "~> 0.9"
-gem "haml", "~> 3.0"
-gem "compass", "~> 0.10.6"
+gem "haml", "~> 3.1.1"
+gem "sass", "~> 3.1.1"
+gem "compass", "~> 0.11.1"
gem "grid-coordinates", "~> 1.1.4"
gem "meyer-reset", "~> 2.0.0"
View
22 Gemfile.lock
@@ -1,28 +1,34 @@
GEM
remote: http://rubygems.org/
specs:
- compass (0.10.6)
- haml (>= 3.0.4)
+ chunky_png (1.2.0)
+ compass (0.11.1)
+ chunky_png (~> 1.1)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ fssm (0.2.7)
grid-coordinates (1.1.4)
compass (>= 0.10.5)
- haml (3.0.24)
+ haml (3.1.1)
meyer-reset (2.0.0)
compass (>= 0.10.5)
- rack (1.2.2)
+ rack (1.3.0)
+ sass (3.1.2)
shotgun (0.9)
rack (>= 1.0)
- sinatra (1.2.3)
+ sinatra (1.2.6)
rack (~> 1.1)
tilt (>= 1.2.2, < 2.0)
- tilt (1.2.2)
+ tilt (1.3.2)
PLATFORMS
ruby
DEPENDENCIES
- compass (~> 0.10.6)
+ compass (~> 0.11.1)
grid-coordinates (~> 1.1.4)
- haml (~> 3.0)
+ haml (~> 3.1.1)
meyer-reset (~> 2.0.0)
+ sass (~> 3.1.1)
shotgun (~> 0.9)
sinatra (~> 1.2.3)
View
2 app.rb
@@ -3,7 +3,7 @@
require 'haml'
# Helpers
-require 'lib/render_partial'
+require './lib/render_partial'
# Set Sinatra variables
set :app_file, __FILE__
View
2 config.rb
@@ -1,4 +1,4 @@
-require 'app'
+require './app'
# Compass Configuration
View
2 config.ru
@@ -1,5 +1,5 @@
require 'rubygems'
require 'sinatra'
-require 'app'
+require './app'
run Sinatra::Application
View
114 public/stylesheets/application.css
@@ -1 +1,113 @@
-@charset "UTF-8";html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-size:100%;font-family:inherit;vertical-align:baseline}body{line-height:1;color:black;background:white}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}q,blockquote{quotes:"" ""}q:before,q:after,blockquote:before,blockquote:after{content:""}a img{border:none}article,aside,canvas,details,figcaption,figure,footer,header,hgroup,menu,nav,section,summary{margin:0;padding:0;border:0;outline:0;display:block}a{color:#36c}a:hover{color:#36c;text-decoration:none}a:focus,a:active{outline:none}body{font:13px Arial,Helvetica,sans-serif;background:#fff;color:#0d0d0d}body h1{position:absolute;top:50%;left:0;font-size:40px;font-weight:bold;margin-top:-40px;text-align:center;width:100%}body ul{-moz-border-radius:6px;-webkit-border-radius:6px;-o-border-radius:6px;-ms-border-radius:6px;-khtml-border-radius:6px;border-radius:6px;background:#e7e7e7;border:1px solid #ccc;margin-top:10px;margin-left:10px;margin-right:10px}body ul li{display:inline;line-height:30px;padding:0 15px}body ul li a{color:#000;text-decoration:none}body ul li a:hover{text-decoration:underline}
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+article, aside, canvas, details, embed,
+figure, figcaption, footer, header, hgroup,
+menu, nav, output, ruby, section, summary,
+time, mark, audio, video {
+ margin: 0;
+ padding: 0;
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: baseline;
+}
+
+body {
+ line-height: 1;
+}
+
+ol, ul {
+ list-style: none;
+}
+
+table {
+ border-collapse: collapse;
+ border-spacing: 0;
+}
+
+caption, th, td {
+ text-align: left;
+ font-weight: normal;
+ vertical-align: middle;
+}
+
+q, blockquote {
+ quotes: none;
+}
+q:before, q:after, blockquote:before, blockquote:after {
+ content: "";
+ content: none;
+}
+
+a img {
+ border: none;
+}
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+
+article, aside, details, figcaption, figure,
+footer, header, hgroup, menu, nav, section {
+ display: block;
+}
+
+a {
+ color: #36c;
+}
+a:hover {
+ color: #36c;
+ text-decoration: none;
+}
+a:focus, a:active {
+ outline: none;
+}
+
+body {
+ font: 13px Arial,Helvetica,sans-serif;
+ background: #fff;
+ color: #0d0d0d;
+}
+body h1 {
+ position: absolute;
+ top: 50%;
+ left: 0;
+ font-size: 40px;
+ font-weight: bold;
+ margin-top: -40px;
+ text-align: center;
+ width: 100%;
+}
+body ul {
+ -moz-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ -o-border-radius: 6px;
+ -ms-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ border-radius: 6px;
+ background: #e7e7e7;
+ border: 1px solid #ccc;
+ margin-top: 10px;
+ margin-left: 10px;
+ margin-right: 10px;
+}
+body ul li {
+ display: inline;
+ line-height: 30px;
+ padding: 0 15px;
+}
+body ul li a {
+ color: #000;
+ text-decoration: none;
+}
+body ul li a:hover {
+ text-decoration: underline;
+}

0 comments on commit 05a73e5

Please sign in to comment.
Something went wrong with that request. Please try again.