github-migration/engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add missing stylesheet for the asset collections section in the back-office

Browse Source
This commit is contained in:
dinedine 2011-01-07 14:50:53 +01:00
parent 8a3151cf58
commit 3ee566eae6
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Gemfile.lock
View File

@ -70,7 +70,7 @@ GEM
term-ansicolor (~> 1.0.4) term-ansicolor (~> 1.0.4)
cucumber-rails (0.3.2) cucumber-rails (0.3.2)
cucumber (>= 0.8.0) cucumber (>= 0.8.0)
culerity (0.2.13) culerity (0.2.14)
custom_fields (1.0.0.beta2) custom_fields (1.0.0.beta2)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
locomotive_carrierwave locomotive_carrierwave
@ -89,11 +89,11 @@ GEM
diff-lcs (1.1.2) diff-lcs (1.1.2)
erubis (2.6.6) erubis (2.6.6)
abstract (>= 1.0.0) abstract (>= 1.0.0)
excon (0.3.6) excon (0.3.7)
factory_girl (1.3.2) factory_girl (1.3.2)
factory_girl_rails (1.0) factory_girl_rails (1.0.1)
factory_girl (~> 1.3) factory_girl (~> 1.3)
rails (>= 3.0.0.beta4) railties (>= 3.0.0)
ffi (0.6.3) ffi (0.6.3)
rake (>= 0.8.7) rake (>= 0.8.7)
fog (0.3.7) fog (0.3.7)
@ -106,16 +106,16 @@ GEM
nokogiri (~> 1.4.3.1) nokogiri (~> 1.4.3.1)
ruby-hmac ruby-hmac
formatador (0.0.16) formatador (0.0.16)
formtastic (1.2.2) formtastic (1.2.3)
actionpack (>= 2.3.7) actionpack (>= 2.3.7)
activesupport (>= 2.3.7) activesupport (>= 2.3.7)
i18n (>= 0.4.0) i18n (~> 0.4)
gherkin (2.1.5) gherkin (2.1.5)
trollop (~> 1.16.2) trollop (~> 1.16.2)
growl-glue (1.0.7) growl-glue (1.0.7)
haml (3.0.18) haml (3.0.18)
has_scope (0.5.0) has_scope (0.5.0)
heroku (1.15.1) heroku (1.16.2)
json_pure (>= 1.2.0, < 1.5.0) json_pure (>= 1.2.0, < 1.5.0)
launchy (~> 0.3.2) launchy (~> 0.3.2)
rest-client (>= 1.4.0, < 1.7.0) rest-client (>= 1.4.0, < 1.7.0)
@ -147,7 +147,7 @@ GEM
locomotive_mongoid_acts_as_tree (0.1.5.1) locomotive_mongoid_acts_as_tree (0.1.5.1)
bson (>= 0.20.1) bson (>= 0.20.1)
mongoid (<= 2.0.0.beta.19) mongoid (<= 2.0.0.beta.19)
mail (2.2.13) mail (2.2.14)
activesupport (>= 2.3.6) activesupport (>= 2.3.6)
i18n (>= 0.4.0) i18n (>= 0.4.0)
mime-types (~> 1.16) mime-types (~> 1.16)
@ -238,7 +238,7 @@ GEM
polyglot (>= 0.3.1) polyglot (>= 0.3.1)
trollop (1.16.2) trollop (1.16.2)
tzinfo (0.3.23) tzinfo (0.3.23)
unicorn (3.2.1) unicorn (3.3.1)
kgio (~> 2.1) kgio (~> 2.1)
rack rack
warden (0.10.7) warden (0.10.7)

1
config/assets.yml
View File

@ -82,6 +82,7 @@ stylesheets:
- public/stylesheets/admin/buttons.css - public/stylesheets/admin/buttons.css
- public/stylesheets/admin/formtastic.css - public/stylesheets/admin/formtastic.css
- public/stylesheets/admin/formtastic_changes.css - public/stylesheets/admin/formtastic_changes.css
- public/stylesheets/admin/assets.css
- public/stylesheets/admin/application.css - public/stylesheets/admin/application.css
- public/stylesheets/admin/safari.css - public/stylesheets/admin/safari.css
fancybox: fancybox:

2
public/stylesheets/admin/application.css
View File

@ -1,5 +1,3 @@
@import url(/stylesheets/admin/assets.css);
/* ___ application messages ___ */ /* ___ application messages ___ */
div.notice { div.notice {