Merge branch 'refs/heads/assets-refactoring' into dev

2011-10-27 14:51:05 +05:00 · 2011-10-27 14:51:05 +05:00 · 00613d0d50
commit 00613d0d50
parent 38cdb3eba0 be364d1004
15 changed files with 16 additions and 17 deletions
--- a/app/assets/images/jquery_ui/images/ui-bg_flat_0_aaaaaa_40x100.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_flat_0_aaaaaa_40x100.png
--- a/app/assets/images/jquery_ui/images/ui-bg_flat_75_ffffff_40x100.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_flat_75_ffffff_40x100.png
--- a/app/assets/images/jquery_ui/images/ui-bg_glass_55_fbf9ee_1x400.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_glass_55_fbf9ee_1x400.png
--- a/app/assets/images/jquery_ui/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_glass_65_ffffff_1x400.png
--- a/app/assets/images/jquery_ui/images/ui-bg_glass_75_dadada_1x400.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_glass_75_dadada_1x400.png
--- a/app/assets/images/jquery_ui/images/ui-bg_glass_75_e6e6e6_1x400.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_glass_75_e6e6e6_1x400.png
--- a/app/assets/images/jquery_ui/images/ui-bg_glass_95_fef1ec_1x400.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_glass_95_fef1ec_1x400.png
--- a/app/assets/images/jquery_ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
+++ b/app/assets/images/jquery_ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
--- a/app/assets/images/jquery_ui/images/ui-icons_222222_256x240.png
+++ b/app/assets/images/jquery_ui/images/ui-icons_222222_256x240.png
--- a/app/assets/images/jquery_ui/images/ui-icons_2e83ff_256x240.png
+++ b/app/assets/images/jquery_ui/images/ui-icons_2e83ff_256x240.png
--- a/app/assets/images/jquery_ui/images/ui-icons_454545_256x240.png
+++ b/app/assets/images/jquery_ui/images/ui-icons_454545_256x240.png
--- a/app/assets/images/jquery_ui/images/ui-icons_888888_256x240.png
+++ b/app/assets/images/jquery_ui/images/ui-icons_888888_256x240.png
--- a/app/assets/images/jquery_ui/images/ui-icons_cd0a0a_256x240.png
+++ b/app/assets/images/jquery_ui/images/ui-icons_cd0a0a_256x240.png
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -7,7 +7,6 @@
    = stylesheet_link_tag 'blueprint/print', :media => "print"
    = stylesheet_link_tag 'blueprint/plugins/buttons/screen', :media => "screen, projection"
    = stylesheet_link_tag 'blueprint/plugins/link-icons/screen', :media => "screen, projection"
-    = stylesheet_link_tag 'jquery_ui/jquery-ui-1.8.16.custom', :media => "screen, projection"
    = stylesheet_link_tag    "application"
    = javascript_include_tag "application"
    = csrf_meta_tags