Permalink
Browse files

phew. rails 3.2.12, including some asset pipeline. still buggy.

  • Loading branch information...
1 parent 6cad85c commit cf5191d33cae880bf2a229de1f96205a7d0c1901 @matchu matchu committed Mar 6, 2013
Showing with 285 additions and 4,533 deletions.
  1. BIN .sass-cache/0969d4d7aefe84b00666c52e2b4cdb39b866b330/_form.sassc
  2. BIN .sass-cache/0b5d02f0d60121c9c08b83882f30ba97c683c5da/_index.sassc
  3. BIN .sass-cache/0eea336093ad63c5b88144fcdb16070342eff84f/_new.sassc
  4. BIN .sass-cache/4d4dbb3f699e777a1a139ac20bf2b4286169219f/_form.sassc
  5. BIN .sass-cache/955c22916a21611dea32e57ab4dd27a87c57e02b/_index.sassc
  6. BIN .sass-cache/955c22916a21611dea32e57ab4dd27a87c57e02b/_show.sassc
  7. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/_items.sassc
  8. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/_layout.sassc
  9. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/application.css.sassc
  10. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/application.sassc
  11. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/screen.css.sassc
  12. BIN .sass-cache/aefa3cfb2be92c8db5a55b813abd729de2d752d0/screen.sassc
  13. BIN .sass-cache/b66bda46953e6fb0d2cf2a44a17dcaf1ae793197/_index.sassc
  14. BIN .sass-cache/b66bda46953e6fb0d2cf2a44a17dcaf1ae793197/_petpage.sassc
  15. BIN .sass-cache/c3a1d01a18d84315aa5f40af3088e05991a9876b/_constants.sassc
  16. BIN .sass-cache/c3a1d01a18d84315aa5f40af3088e05991a9876b/_mixins.sassc
  17. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_campaign-progress.css.sassc
  18. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_campaign-progress.sassc
  19. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_campaign-progress.scssc
  20. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_context_button.sassc
  21. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_icon.sassc
  22. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_jquery.jgrowl.sassc
  23. BIN .sass-cache/cb524f05ec4c79ba09cd5002bd6bf2f00a0d4432/_secondary_nav.sassc
  24. BIN .sass-cache/f18f68f7db8576b328ba95084f09bb9906cb2226/_new.sassc
  25. +13 −5 Gemfile
  26. +77 −55 Gemfile.lock
  27. BIN {public → app/assets}/fonts/Delicious-Bold.otf
  28. BIN {public → app/assets}/fonts/Delicious-Heavy.otf
  29. BIN {public → app/assets}/fonts/Delicious-Italic.otf
  30. BIN {public → app/assets}/fonts/Delicious-Roman.otf
  31. BIN {public → app/assets}/images/alert-overlay.png
  32. BIN {public → app/assets}/images/blog.png
  33. BIN {public → app/assets}/images/default_preview.png
  34. BIN {public → app/assets}/images/forum.png
  35. BIN {public → app/assets}/images/grid.png
  36. BIN {public → app/assets}/images/image_mode_icon.png
  37. BIN {public → app/assets}/images/image_mode_preview.png
  38. BIN {public → app/assets}/images/items.png
  39. BIN {public → app/assets}/images/link_go.png
  40. BIN {public → app/assets}/images/loading.gif
  41. BIN {public → app/assets}/images/loading_current_outfit.gif
  42. BIN {public → app/assets}/images/loading_outfit_pane.gif
  43. BIN {public → app/assets}/images/nc.png
  44. BIN {public → app/assets}/images/neomail.png
  45. BIN {public → app/assets}/images/neomail_edit.png
  46. BIN {public → app/assets}/images/outfits/default.png
  47. BIN {public → app/assets}/images/outfits/medium_default.png
  48. BIN {public → app/assets}/images/outfits/small_default.png
  49. BIN {public → app/assets}/images/outfits/small_loading.gif
  50. BIN {public → app/assets}/images/outfits_welcome.png
  51. BIN {public → app/assets}/images/owned.png
  52. BIN {public → app/assets}/images/star.png
  53. BIN {public → app/assets}/images/unstarred.png
  54. BIN {public → app/assets}/images/wanted.png
  55. BIN {public → app/assets}/images/your_items.png
  56. 0 app/{ → assets}/stylesheets/_items.sass
  57. 0 app/{ → assets}/stylesheets/_layout.sass
  58. +2 −2 app/{stylesheets/screen.sass → assets/stylesheets/application.css.sass}
  59. 0 app/{ → assets}/stylesheets/broken_image_reports/_new.sass
  60. +4 −4 app/{ → assets}/stylesheets/closet_hangers/_index.sass
  61. 0 app/{ → assets}/stylesheets/closet_hangers/_petpage.sass
  62. 0 app/{ → assets}/stylesheets/closet_lists/_form.sass
  63. 0 app/{ → assets}/stylesheets/contributions/_index.sass
  64. 0 app/{ → assets}/stylesheets/items/_index.sass
  65. 0 app/{ → assets}/stylesheets/items/_show.sass
  66. 0 app/{ → assets}/stylesheets/neopets_pages/_new.sass
  67. 0 app/{ → assets}/stylesheets/neopets_users/_form.sass
  68. +2 −2 app/{ → assets}/stylesheets/outfits/_edit.sass
  69. 0 app/{ → assets}/stylesheets/outfits/_index.sass
  70. +0 −1 app/{ → assets}/stylesheets/outfits/_new.sass
  71. 0 app/{ → assets}/stylesheets/outfits/_show.sass
  72. 0 app/{ → assets}/stylesheets/outfits/_star.sass
  73. 0 app/{ → assets}/stylesheets/partials/_blue.sass
  74. +3 −4 app/{ → assets}/stylesheets/partials/_campaign-progress.sass
  75. 0 app/{ → assets}/stylesheets/partials/_context_button.sass
  76. 0 app/{ → assets}/stylesheets/partials/_icon.sass
  77. 0 app/{ → assets}/stylesheets/partials/_jquery.jgrowl.sass
  78. 0 app/{ → assets}/stylesheets/partials/_outfit.sass
  79. 0 app/{ → assets}/stylesheets/partials/_secondary_nav.sass
  80. 0 app/{ → assets}/stylesheets/partials/_wardrobe.sass
  81. 0 app/{ → assets}/stylesheets/partials/clean/_constants.sass
  82. 0 app/{ → assets}/stylesheets/partials/clean/_mixins.sass
  83. 0 app/{ → assets}/stylesheets/pets/_bulk.sass
  84. 0 app/{ → assets}/stylesheets/print.sass
  85. +0 −1 app/{ → assets}/stylesheets/static/_donate.sass
  86. 0 app/{ → assets}/stylesheets/static/_image_mode.sass
  87. 0 app/{ → assets}/stylesheets/static/_terms.sass
  88. 0 app/{ → assets}/stylesheets/users/_top_contributors.sass
  89. +1 −1 app/views/layouts/application.html.haml
  90. +4 −0 config/application.rb
  91. +0 −11 config/compass.rb
  92. +13 −0 config/environments/development.rb
  93. +18 −0 config/environments/production.rb
  94. +7 −0 config/environments/test.rb
  95. +1 −1 config/initializers/{hoptoad.rb → airbrake.rb}
  96. +0 −5 config/initializers/compass.rb
  97. +140 −4,441 public/stylesheets/compiled/screen.css
  98. BIN vendor/cache/actionmailer-3.1.11.gem
  99. BIN vendor/cache/actionmailer-3.2.12.gem
  100. BIN vendor/cache/actionpack-3.1.11.gem
  101. BIN vendor/cache/actionpack-3.2.12.gem
  102. BIN vendor/cache/activemodel-3.1.11.gem
  103. BIN vendor/cache/activemodel-3.2.12.gem
  104. BIN vendor/cache/activerecord-3.1.11.gem
  105. BIN vendor/cache/activerecord-3.2.12.gem
  106. BIN vendor/cache/activeresource-3.1.11.gem
  107. BIN vendor/cache/activeresource-3.2.12.gem
  108. BIN vendor/cache/activesupport-3.1.11.gem
  109. BIN vendor/cache/activesupport-3.2.12.gem
  110. BIN vendor/cache/airbrake-3.1.8.gem
  111. BIN vendor/cache/arel-2.2.3.gem
  112. BIN vendor/cache/arel-3.0.2.gem
  113. BIN vendor/cache/bcrypt-ruby-2.1.4.gem
  114. BIN vendor/cache/bcrypt-ruby-3.0.1.gem
  115. BIN vendor/cache/chunky_png-1.2.7.gem
  116. BIN vendor/cache/compass-0.10.6.gem
  117. BIN vendor/cache/compass-0.12.2.gem
  118. BIN vendor/cache/compass-rails-1.0.3.gem
  119. BIN vendor/cache/devise-1.1.9.gem
  120. BIN vendor/cache/devise-2.2.3.gem
  121. BIN vendor/cache/execjs-1.4.0.gem
  122. BIN vendor/cache/fssm-0.2.10.gem
  123. BIN vendor/cache/haml-3.0.25.gem
  124. BIN vendor/cache/haml-4.0.0.gem
  125. BIN vendor/cache/hoptoad_notifier-2.4.11.gem
  126. BIN vendor/cache/journey-1.0.4.gem
  127. BIN vendor/cache/mail-2.3.3.gem
  128. BIN vendor/cache/mail-2.4.4.gem
  129. BIN vendor/cache/orm_adapter-0.4.0.gem
  130. BIN vendor/cache/rack-1.3.10.gem
  131. BIN vendor/cache/rack-1.4.5.gem
  132. BIN vendor/cache/rack-mount-0.8.3.gem
  133. BIN vendor/cache/{rails-3.1.11.gem → rails-3.2.12.gem}
  134. BIN vendor/cache/railties-3.1.11.gem
  135. BIN vendor/cache/railties-3.2.12.gem
  136. BIN vendor/cache/sass-3.2.6.gem
  137. BIN vendor/cache/sass-rails-3.2.6.gem
  138. BIN vendor/cache/sprockets-2.0.4.gem
  139. BIN vendor/cache/sprockets-2.2.2.gem
  140. BIN vendor/cache/thor-0.14.6.gem
  141. BIN vendor/cache/thor-0.17.0.gem
  142. BIN vendor/cache/uglifier-1.3.0.gem
  143. BIN vendor/cache/warden-1.0.6.gem
  144. BIN vendor/cache/warden-1.2.1.gem
View
@@ -1,17 +1,16 @@
source 'http://rubygems.org'
-gem 'rails', '= 3.1.11'
+gem 'rails', '= 3.2.12'
#gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
gem 'mysql2', '>= 0.3.11'
# https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
gem 'json', '~> 1.7.7'
-gem 'compass', '~> 0.10.1'
-gem 'haml', '~> 3.0.18'
+gem 'haml', '~> 4.0.0'
gem 'rdiscount', '~> 1.6.5'
gem 'will_paginate', '~> 3.0.pre2'
-gem 'devise', '~> 1.1.5'
+gem 'devise', '~> 2.2.3'
# unstable version of RocketAMF interprets info registry as a hash instead of an array
gem 'RocketAMF', :git => 'git://github.com/rubyamf/rocketamf.git'
@@ -21,7 +20,7 @@ gem 'openneo-auth-signatory', '~> 0.1.0'
gem 'jammit', '~> 0.6.5'
-gem 'hoptoad_notifier'
+gem 'airbrake', '~> 3.1.8'
gem 'addressable', :require => ['addressable/template', 'addressable/uri']
@@ -65,6 +64,15 @@ gem "rest-client", "~> 1.6.7"
gem "rails-i18n"
+# Needed for the new asset pipeline
+group :assets do
+
+end
+
+gem 'sass-rails', "~> 3.2.6"
+gem 'compass-rails', "~> 1.0.3"
+gem 'uglifier', ">= 1.0.3"
+
group :development do
gem "bullet", "~> 4.1.5"
end
View
@@ -79,56 +79,68 @@ GEM
Platform (>= 0.4.0)
open4
Platform (0.4.0)
- actionmailer (3.1.11)
- actionpack (= 3.1.11)
- mail (~> 2.3.3)
- actionpack (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
+ actionmailer (3.2.12)
+ actionpack (= 3.2.12)
+ mail (~> 2.4.4)
+ actionpack (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.6)
+ journey (~> 1.0.4)
+ rack (~> 1.4.5)
rack-cache (~> 1.2)
- rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.0.4)
- activemodel (3.1.11)
- activesupport (= 3.1.11)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.12)
+ activesupport (= 3.2.12)
builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
- arel (~> 2.2.3)
+ activerecord (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.1.11)
- activemodel (= 3.1.11)
- activesupport (= 3.1.11)
- activesupport (3.1.11)
+ activeresource (3.2.12)
+ activemodel (= 3.2.12)
+ activesupport (= 3.2.12)
+ activesupport (3.2.12)
+ i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.3)
- arel (2.2.3)
- bcrypt-ruby (2.1.4)
+ airbrake (3.1.8)
+ activesupport
+ builder
+ json
+ arel (3.0.2)
+ bcrypt-ruby (3.0.1)
builder (3.0.4)
bullet (4.1.6)
uniform_notifier (~> 1.0.0)
carrierwave (0.5.8)
activesupport (~> 3.0)
character-encodings (0.4.1)
chronic (0.6.7)
- compass (0.10.6)
- haml (>= 3.0.4)
+ chunky_png (1.2.7)
+ compass (0.12.2)
+ chunky_png (~> 1.2)
+ fssm (>= 0.2.7)
+ sass (~> 3.1)
+ compass-rails (1.0.3)
+ compass (>= 0.12.2, < 0.14)
cookiejar (0.3.0)
- devise (1.1.9)
- bcrypt-ruby (~> 2.1.2)
- warden (~> 1.0.2)
+ devise (2.2.3)
+ bcrypt-ruby (~> 3.0)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
diff-lcs (1.2.1)
dye (0.1.4)
em-socksify (0.2.1)
eventmachine (>= 1.0.0.beta.4)
erubis (2.7.0)
excon (0.19.3)
+ execjs (1.4.0)
+ multi_json (~> 1.0)
factory_girl (2.6.4)
activesupport (>= 2.3.9)
factory_girl_rails (1.7.0)
@@ -145,17 +157,17 @@ GEM
nokogiri (~> 1.5.0)
ruby-hmac
formatador (0.2.4)
- haml (3.0.25)
+ fssm (0.2.10)
+ haml (4.0.0)
+ tilt
hike (1.2.1)
- hoptoad_notifier (2.4.11)
- activesupport
- builder
http_parser.rb (0.5.3)
i18n (0.6.4)
jammit (0.6.5)
yui-compressor (>= 0.9.3)
+ journey (1.0.4)
json (1.7.7)
- mail (2.3.3)
+ mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
@@ -174,6 +186,7 @@ GEM
open4 (1.3.0)
openneo-auth-signatory (0.1.0)
ruby-hmac
+ orm_adapter (0.4.0)
paper_trail (2.7.1)
activerecord (~> 3.0)
railties (~> 3.0)
@@ -184,35 +197,33 @@ GEM
prompter (0.1.5)
dye (>= 0.1.1)
yard (>= 0.6.3)
- rack (1.3.10)
+ rack (1.4.5)
rack-cache (1.2)
rack (>= 0.4)
rack-fiber_pool (0.9.2)
- rack-mount (0.8.3)
- rack (>= 1.0.0)
rack-protection (1.4.0)
rack
rack-ssl (1.3.3)
rack
rack-test (0.6.2)
rack (>= 1.0)
- rails (3.1.11)
- actionmailer (= 3.1.11)
- actionpack (= 3.1.11)
- activerecord (= 3.1.11)
- activeresource (= 3.1.11)
- activesupport (= 3.1.11)
+ rails (3.2.12)
+ actionmailer (= 3.2.12)
+ actionpack (= 3.2.12)
+ activerecord (= 3.2.12)
+ activeresource (= 3.2.12)
+ activesupport (= 3.2.12)
bundler (~> 1.0)
- railties (= 3.1.11)
+ railties (= 3.2.12)
rails-i18n (0.7.2)
i18n (~> 0.5)
- railties (3.1.11)
- actionpack (= 3.1.11)
- activesupport (= 3.1.11)
+ railties (3.2.12)
+ actionpack (= 3.2.12)
+ activesupport (= 3.2.12)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (>= 0.14.6, < 2.0)
rake (10.0.3)
rdiscount (1.6.8)
rdoc (3.12.2)
@@ -254,26 +265,35 @@ GEM
tzinfo (>= 0.3.23)
sanitize (2.0.3)
nokogiri (>= 1.4.4, < 1.6)
+ sass (3.2.6)
+ sass-rails (3.2.6)
+ railties (~> 3.2.0)
+ sass (>= 3.1.10)
+ tilt (~> 1.3)
sinatra (1.3.3)
rack (~> 1.3, >= 1.3.6)
rack-protection (~> 1.2)
tilt (~> 1.3, >= 1.3.3)
- sprockets (2.0.4)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
subexec (0.2.2)
swf_converter (0.0.3)
- thor (0.14.6)
+ thor (0.17.0)
tilt (1.3.4)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.36)
+ uglifier (1.3.0)
+ execjs (>= 0.3.0)
+ multi_json (~> 1.0, >= 1.0.2)
uniform_notifier (1.0.2)
vegas (0.1.11)
rack (>= 1.0.0)
- warden (1.0.6)
+ warden (1.2.1)
rack (>= 1.0)
whenever (0.7.3)
activesupport (>= 2.3.4)
@@ -289,11 +309,12 @@ PLATFORMS
DEPENDENCIES
RocketAMF!
addressable
+ airbrake (~> 3.1.8)
bullet (~> 4.1.5)
carrierwave (~> 0.5.8)
character-encodings (~> 0.4.1)
- compass (~> 0.10.1)
- devise (~> 1.1.5)
+ compass-rails (~> 1.0.3)
+ devise (~> 2.2.3)
em-http-request!
em-mysqlplus!
em-synchrony!
@@ -302,8 +323,7 @@ DEPENDENCIES
flex!
fog (~> 1.8.0)
globalize3!
- haml (~> 3.0.18)
- hoptoad_notifier
+ haml (~> 4.0.0)
http_accept_language!
jammit (~> 0.6.5)
json (~> 1.7.7)
@@ -319,7 +339,7 @@ DEPENDENCIES
parallel (~> 0.5.17)
patron (~> 0.4.18)
rack-fiber_pool
- rails (= 3.1.11)
+ rails (= 3.2.12)
rails-i18n
rdiscount (~> 1.6.5)
resque (~> 1.23.0)
@@ -329,6 +349,8 @@ DEPENDENCIES
right_aws (~> 2.1.0)
rspec-rails (~> 2.0.0.beta.22)
sanitize (~> 2.0.3)
+ sass-rails (~> 3.2.6)
swf_converter (~> 0.0.3)
+ uglifier (>= 1.0.3)
whenever (~> 0.7.3)
will_paginate (~> 3.0.pre2)
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
@@ -1,4 +1,5 @@
@import compass
+
@import partials/clean/constants
@import partials/clean/mixins
@@ -24,5 +25,4 @@
@import static/donate
@import static/image_mode
@import static/terms
-@import users/top_contributors
-
+@import users/top_contributors
@@ -1,6 +1,6 @@
-@import "partials/context_button"
-@import "partials/icon"
-@import "partials/secondary_nav"
+@import "../partials/context_button"
+@import "../partials/icon"
+@import "../partials/secondary_nav"
body.closet_hangers-index
+secondary-nav
@@ -18,7 +18,7 @@ body.closet_hangers-index
input[name=q]
&.loading
background:
- image: url(/images/loading.gif)
+ image: image-url("loading.gif")
position: 2px center
repeat: no-repeat
padding-left: $icon-width + 4px
@@ -1,4 +1,4 @@
-@import ../shared/jquery.jgrowl
+@import partials/jquery.jgrowl
@import partials/wardrobe
@import "partials/context_button"
@@ -451,7 +451,7 @@ body.outfits-edit
.outfit-thumbnail-wrapper
+opacity(.5)
background:
- image: url(/images/outfits/small_default.png)
+ image: image-url("small_default.png")
position: center center
size: $outfit-inner-size $outfit-inner-size
cursor: pointer
@@ -1,4 +1,3 @@
-@import "compass/css3/gradient"
@import "partials/campaign-progress"
body.outfits-new
@@ -2,7 +2,7 @@
.campaign-progress-wrapper
+border-radius(8px)
background: #aaa
- +linear-gradient(color-stops(#ccc, #aaa))
+ background-image: linear-gradient(color-stops(#ccc, #aaa))
border: 4px solid $module-border-color
clear: both
@@ -21,7 +21,7 @@
.campaign-progress
background: $module-border-color
- +linear-gradient(color-stops($module-border-color + #222, $module-border-color))
+ background-image: linear-gradient(color-stops($module-border-color + #222, $module-border-color))
border-right: 1px solid $module-border-color
.campaign-progress-wrapper, .campaign-progress
@@ -41,5 +41,4 @@
&.campaign-loaded
.campaign-progress-wrapper
- visibility: visible
-
+ visibility: visible
File renamed without changes.
@@ -1,4 +1,3 @@
-@import "compass/css3/gradient"
@import "compass/css3/text-shadow"
@import "partials/campaign-progress"
@@ -12,7 +12,7 @@
/[if IE]
= include_javascript_libraries :html5
= yield :stylesheets
- = stylesheet_link_tag "compiled/screen"
+ = stylesheet_link_tag "application"
= yield :meta
= open_graph_tags
= csrf_meta_tag
Oops, something went wrong.

0 comments on commit cf5191d

Please sign in to comment.