Skip to content
Browse files

update Sass

  • Loading branch information...
1 parent 0844b8c commit 8ae1b7ddf9aace8765c064ac4cf97964c4f1d71f @mislav committed Mar 17, 2013
Showing with 10 additions and 16 deletions.
  1. +1 −1 .gitmodules
  2. +1 −6 Gemfile
  3. +4 −7 Gemfile.lock
  4. +1 −1 bootstrap
  5. +3 −1 views/style.sass
View
2 .gitmodules
@@ -1,3 +1,3 @@
[submodule "bootstrap"]
path = bootstrap
- url = https://github.com/jlong/sass-twitter-bootstrap.git
+ url = https://github.com/mislav/sass-twitter-bootstrap.git
View
7 Gemfile
@@ -10,13 +10,8 @@ gem 'i18n' # stupid activesupport dependency
gem 'rack-cache'
gem 'dalli'
-group :development do
- gem 'shotgun'
-end
-
-gem 'sass', '> 3.2.0.alpha'
+gem 'sass', '~> 3.2.0'
gem 'coffee-script'
-gem 'therubyracer-heroku', '~> 0.8.1.pre3', :group => :production
gem 'uglifier'
gem 'nokogiri'
View
11 Gemfile.lock
@@ -39,14 +39,12 @@ GEM
rack (>= 0.4)
rack-protection (1.2.0)
rack
- sass (3.2.0.alpha.96)
- shotgun (0.9)
- rack (>= 1.0)
+ rake (10.0.3)
+ sass (3.2.7)
sinatra (1.3.2)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- therubyracer-heroku (0.8.1.pre3)
thin (1.3.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
@@ -70,9 +68,8 @@ DEPENDENCIES
i18n
nokogiri
rack-cache
- sass (> 3.2.0.alpha)
- shotgun
+ rake
+ sass (~> 3.2.0)
sinatra
- therubyracer-heroku (~> 0.8.1.pre3)
thin
uglifier
2 bootstrap
@@ -1 +1 @@
-Subproject commit e139cc89b2b7ba71aacd14e8d3311af5cd5fbbb4
+Subproject commit 5b52f9e4c9652fa5daa9b4a620581a5836b739f2
View
4 views/style.sass
@@ -1,3 +1,5 @@
+$navbarHeight: 30px
+
@import bootstrap
@import screen
@import print
@@ -31,7 +33,7 @@ $phonePadding: 8px
line-height: 1.6
+screen(tablet)
- +grid-core-generate(42px, 20px)
+ +grid-core(42px, 20px)
#home
+screen(nonphone)

0 comments on commit 8ae1b7d

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