diff --git a/app/assets/stylesheets/tablet/application.css b/app/assets/stylesheets/supplier/application.css similarity index 100% rename from app/assets/stylesheets/tablet/application.css rename to app/assets/stylesheets/supplier/application.css diff --git a/app/assets/stylesheets/phone/darkstrap.sass b/app/assets/stylesheets/supplier/darkstrap.sass similarity index 100% rename from app/assets/stylesheets/phone/darkstrap.sass rename to app/assets/stylesheets/supplier/darkstrap.sass diff --git a/app/assets/stylesheets/phone/mixins.sass b/app/assets/stylesheets/supplier/mixins.sass similarity index 100% rename from app/assets/stylesheets/phone/mixins.sass rename to app/assets/stylesheets/supplier/mixins.sass diff --git a/app/assets/stylesheets/tablet/section_tables.css.sass b/app/assets/stylesheets/supplier/section_tables.css.sass similarity index 100% rename from app/assets/stylesheets/tablet/section_tables.css.sass rename to app/assets/stylesheets/supplier/section_tables.css.sass diff --git a/app/assets/stylesheets/tablet/structure.css.sass b/app/assets/stylesheets/supplier/structure.css.sass similarity index 100% rename from app/assets/stylesheets/tablet/structure.css.sass rename to app/assets/stylesheets/supplier/structure.css.sass diff --git a/app/assets/stylesheets/phone/application.css b/app/assets/stylesheets/user/application.css similarity index 100% rename from app/assets/stylesheets/phone/application.css rename to app/assets/stylesheets/user/application.css diff --git a/app/assets/stylesheets/tablet/darkstrap.sass b/app/assets/stylesheets/user/darkstrap.sass similarity index 100% rename from app/assets/stylesheets/tablet/darkstrap.sass rename to app/assets/stylesheets/user/darkstrap.sass diff --git a/app/assets/stylesheets/tablet/mixins.sass b/app/assets/stylesheets/user/mixins.sass similarity index 100% rename from app/assets/stylesheets/tablet/mixins.sass rename to app/assets/stylesheets/user/mixins.sass diff --git a/app/assets/stylesheets/phone/structure.css.sass b/app/assets/stylesheets/user/structure.css.sass similarity index 100% rename from app/assets/stylesheets/phone/structure.css.sass rename to app/assets/stylesheets/user/structure.css.sass diff --git a/app/views/layouts/phone.html.slim b/app/views/layouts/phone.html.slim index 09dde61d..b4a27607 100644 --- a/app/views/layouts/phone.html.slim +++ b/app/views/layouts/phone.html.slim @@ -10,7 +10,7 @@ html lang="en" /! Le HTML5 shim, for IE6-8 support of HTML elements /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" - = stylesheet_link_tag "phone/application", :media => "all" + = stylesheet_link_tag "user/application", :media => "all" link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144" link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114" link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72" diff --git a/app/views/layouts/tablet.html.slim b/app/views/layouts/tablet.html.slim index 92769047..06f51bab 100644 --- a/app/views/layouts/tablet.html.slim +++ b/app/views/layouts/tablet.html.slim @@ -11,7 +11,7 @@ html lang="en" /[if lt IE 9] = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js" = stylesheet_link_tag "supplier/application", :media => "all" - = stylesheet_link_tag "tablet/application", :media => "all" + = stylesheet_link_tag "supplier/application", :media => "all" link href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144" link href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114" link href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72" diff --git a/app/views/user/active_list.html.slim b/app/views/user/active_list.html.slim index e753ead8..724b9f67 100644 --- a/app/views/user/active_list.html.slim +++ b/app/views/user/active_list.html.slim @@ -12,6 +12,8 @@ th= Order.model_name.human th.currency= Product.human_attribute_name(:price) tbody + tr + td colspan=2 = slider_image tfoot - content_for :footer do javascript: diff --git a/config/application.rb b/config/application.rb index 584ab998..ea2a2b73 100644 --- a/config/application.rb +++ b/config/application.rb @@ -72,7 +72,7 @@ module Qrammer # Enable the asset pipeline config.assets.enabled = true - #config.assets.precompile += ['tablet/application.css'] + config.assets.precompile += ['supplier/application.css', 'user/application.css', 'qr_sheet/application.css'] # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0'