Skip to content
This repository has been archived by the owner on Apr 15, 2023. It is now read-only.

Commit

Permalink
updated rails-sass to RC4 so asset_path works in sass, cleaned up sas…
Browse files Browse the repository at this point in the history
…s files and made them not use erb
  • Loading branch information
roytomeij committed Jul 21, 2011
1 parent d27c1d4 commit 8aebc24
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -48,7 +48,7 @@ group :test do
gem 'fuubar'
gem 'vcr'

gem 'mustang'
gem 'therubyracer'
end

group :development, :test do
Expand Down
10 changes: 6 additions & 4 deletions Gemfile.lock
Expand Up @@ -112,6 +112,7 @@ GEM
launchy (0.4.0)
configuration (>= 0.0.5)
rake (>= 0.8.1)
libv8 (3.3.10.2)
mail (2.3.0)
i18n (>= 0.4.0)
mime-types (~> 1.16)
Expand All @@ -130,7 +131,6 @@ GEM
multi_json (1.0.3)
multi_xml (0.2.2)
multipart-post (1.1.2)
mustang (0.2.2)
net-ldap (0.2.2)
newrelic_rpm (2.14.1)
nokogiri (1.4.4)
Expand Down Expand Up @@ -232,10 +232,10 @@ GEM
ffi (~> 1.0.7)
rubyzip (0.9.4)
sass (3.1.4)
sass-rails (3.1.0.rc.2)
sass-rails (3.1.0.rc.4)
actionpack (~> 3.1.0.rc1)
railties (~> 3.1.0.rc1)
sass (>= 3.1.2)
sass (>= 3.1.4)
sprockets (>= 2.0.0.beta.9)
selenium-webdriver (0.2.0)
childprocess (>= 0.1.7)
Expand All @@ -248,6 +248,8 @@ GEM
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
stringex (1.2.1)
therubyracer (0.9.2)
libv8 (~> 3.3.10)
thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand Down Expand Up @@ -292,13 +294,13 @@ DEPENDENCIES
mocha
mongoid (~> 2.0)
mongoid_slug
mustang
omniauth
rails (= 3.1.0.rc4)
rpm_contrib
rspec-rails
sass-rails
spork (~> 0.9.0.rc)
therubyracer
thin
timecop
uglifier
Expand Down
5 changes: 0 additions & 5 deletions app/assets/stylesheets/application.css

This file was deleted.

Expand Up @@ -108,7 +108,7 @@ form
width: 375px

h1 a
background-image: url(<%= asset_path 'logo_transparant.png' %>)
background-image: asset_url('logo_transparant.png', image)
text-indent: -9999px
height: 100px
display: block
Expand Down Expand Up @@ -184,7 +184,7 @@ form
height: 100px

fieldset
background-image: url(<%= asset_path 'happyface.png' %>), url(<%= asset_path 'sadface.png' %>)
background-image: asset_url('happyface.png', image), asset_url('sadface.png', image)
background-position: right, left
background-repeat: no-repeat
padding: 0 20px
Expand Down Expand Up @@ -217,16 +217,16 @@ form
margin: 20px 0

.gold
background-image: url(<%= asset_path 'gold.png' %>)
background-image: asset_url('gold.png', image)

.silver
background-image: url(<%= asset_path 'silver.png' %>)
background-image: asset_url('silver.png', image)

.bronze
background-image: url(<%= asset_path 'bronze.png' %>)
background-image: asset_url('bronze.png', image)

#container.home
background-image: url(<%= asset_path 'gradient.png' %>), url(<%= asset_path 'steven.jpg' %>)
background-image: asset_url('gradient.png', image), asset_url('steven.jpg', image)
background-position: left 170px, right top
background-repeat: repeat-x, no-repeat
background-size: auto 30px, auto auto
Expand Down Expand Up @@ -319,7 +319,7 @@ form ul
height: 20px
position: absolute
width: 100%
background-image: url(<%= asset_path 'gradient.png' %>)
background-image: asset_url('gradient.png', image)

span
display: none
Expand Down Expand Up @@ -358,7 +358,7 @@ strong
padding-left: 5px

a
background-image: url(<%= asset_path '6sync.png' %>)
background-image: asset_url('6sync.png', image)
text-indent: -9999px
height: 28px
width: 73px
Expand Down Expand Up @@ -415,3 +415,5 @@ table

td
padding: 5px 10px

@import gust
5 changes: 0 additions & 5 deletions app/assets/stylesheets/entry_viewer.css

This file was deleted.

Expand Up @@ -64,3 +64,5 @@ div#entry
display: block
color: inherit
text-decoration: none

@import gust
File renamed without changes.

0 comments on commit 8aebc24

Please sign in to comment.