diff --git a/app/assets/javascripts/supplier/app/store.js.coffee b/app/assets/javascripts/supplier/app/store.js.coffee index cd7200a5..ca4ab7c0 100644 --- a/app/assets/javascripts/supplier/app/store.js.coffee +++ b/app/assets/javascripts/supplier/app/store.js.coffee @@ -1,15 +1,12 @@ # http://emberjs.com/guides/models/defining-a-store/ -DS.RESTAdapter.reopen - namespace: 'supplier' +#DS.RESTAdapter.reopen +# namespace: 'supplier' Qsupplier.App.ApplicationSerializer = DS.ActiveModelSerializer -Qsupplier.App.CustomAdapter = DS.RESTAdapter.extend - - # user underscored paths - pathForType: (type)-> - decamelized = Ember.String.decamelize(type) - Ember.String.pluralize(decamelized) -Qsupplier.App.Store = DS.Store.extend - revision: 13 - adapter: Qsupplier.App.CustomAdapter +Qsupplier.App.ApplicationStore = DS.Store.extend + adapter: DS.RESTAdapter.extend + namespace: 'supplier' + # user underscored paths + pathForType: (type)-> + Ember.String.pluralize(Ember.String.decamelize(type)) diff --git a/app/assets/stylesheets/supplier/foundation1/application.css.sass b/app/assets/stylesheets/supplier/foundation1/application.css.sass index dd206bfc..4e69f639 100644 --- a/app/assets/stylesheets/supplier/foundation1/application.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/application.css.sass @@ -11,8 +11,6 @@ @import ./menu_main @import ./menu_side @import ./qsections -@import ./product_categories -@import ./products_preview @import ./qtables @import ./section_tab_headers @import ./qlists diff --git a/app/assets/stylesheets/supplier/foundation1/_product_categories.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_product_categories.css.sass similarity index 79% rename from app/assets/stylesheets/supplier/foundation1/_product_categories.css.sass rename to app/assets/stylesheets/supplier/foundation1/components/_product_categories.css.sass index 3d54484c..fb897b4c 100644 --- a/app/assets/stylesheets/supplier/foundation1/_product_categories.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/components/_product_categories.css.sass @@ -14,23 +14,27 @@ &.inactive opacity: 0.4 #full_day-controller + line-height: 34px + vertical-align: top + // height: 34px + display: inline-block span @extend .fa @extend .fa-clock-o margin: 0 10px - color: #f70 + color: #444 &.active span - // Full day active is not special, highlight when not active, - // because it indicates the being active of a time range - color: #444 + color: #f70 #sub-day-container display: inline-block + vertical-align: top &.hide display: none select width: 70px margin-right: 14px + margin-bottom: 0 .product-category-visible-never @extend .fa @extend .fa-times diff --git a/app/assets/stylesheets/supplier/foundation1/_products_preview.css.sass b/app/assets/stylesheets/supplier/foundation1/components/_products_preview.css.sass similarity index 100% rename from app/assets/stylesheets/supplier/foundation1/_products_preview.css.sass rename to app/assets/stylesheets/supplier/foundation1/components/_products_preview.css.sass