solidus_backend 1.1.4 → 1.2.0.beta1

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of solidus_backend might be problematic. Click here for more details.

Files changed (205) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/images/solidus-style-guide-logo.png +0 -0
  3. data/app/assets/javascripts/spree/backend/admin.js.erb +1 -7
  4. data/app/assets/javascripts/spree/backend/checkouts/edit.js +2 -2
  5. data/app/assets/javascripts/spree/backend/navigation.coffee +10 -0
  6. data/app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb +6 -6
  7. data/app/assets/javascripts/spree/backend/option_value_picker.js +6 -6
  8. data/app/assets/javascripts/spree/backend/product_picker.js +6 -6
  9. data/app/assets/javascripts/spree/backend/shipments.js.erb +17 -3
  10. data/app/assets/javascripts/spree/backend/stock_movement.js.coffee +2 -2
  11. data/app/assets/javascripts/spree/backend/style_guide.coffee +2 -0
  12. data/app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb +6 -6
  13. data/app/assets/javascripts/spree/backend/taxonomy.js.coffee +82 -109
  14. data/app/assets/javascripts/spree/backend/taxons.js.coffee +4 -5
  15. data/app/assets/javascripts/spree/backend/user_picker.js +8 -8
  16. data/app/assets/javascripts/spree/backend/variant_autocomplete.js.coffee.erb +3 -3
  17. data/app/assets/javascripts/spree/backend.js +3 -6
  18. data/app/assets/stylesheets/spree/backend/components/_messages.scss +1 -4
  19. data/app/assets/stylesheets/spree/backend/components/_navigation.scss +99 -115
  20. data/app/assets/stylesheets/spree/backend/components/_progress.scss +1 -1
  21. data/app/assets/stylesheets/spree/backend/components/_sidebar.scss +6 -0
  22. data/app/assets/stylesheets/spree/backend/globals/_variables.scss +18 -0
  23. data/app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss +35 -0
  24. data/app/assets/stylesheets/spree/backend/plugins/_powertip.scss +1 -0
  25. data/app/assets/stylesheets/spree/backend/sections/_style_guide.scss +132 -0
  26. data/app/assets/stylesheets/spree/backend/sections/_taxonomies.scss +60 -0
  27. data/app/assets/stylesheets/spree/backend/shared/_forms.scss +2 -0
  28. data/app/assets/stylesheets/spree/backend/shared/_layout.scss +36 -4
  29. data/app/assets/stylesheets/spree/backend/shared/_typography.scss +3 -6
  30. data/app/assets/stylesheets/spree/backend/spree_admin.scss +4 -1
  31. data/app/assets/stylesheets/spree/backend.css +1 -1
  32. data/app/controllers/spree/admin/orders_controller.rb +6 -6
  33. data/app/controllers/spree/admin/payment_methods_controller.rb +1 -1
  34. data/app/controllers/spree/admin/payments_controller.rb +1 -1
  35. data/app/controllers/spree/admin/products_controller.rb +0 -1
  36. data/app/controllers/spree/admin/reports_controller.rb +2 -2
  37. data/app/controllers/spree/admin/search_controller.rb +9 -7
  38. data/app/controllers/spree/admin/stock_transfers_controller.rb +6 -14
  39. data/app/controllers/spree/admin/style_guide_controller.rb +33 -0
  40. data/app/helpers/spree/admin/adjustments_helper.rb +2 -6
  41. data/app/helpers/spree/admin/base_helper.rb +7 -6
  42. data/app/helpers/spree/admin/navigation_helper.rb +12 -5
  43. data/app/helpers/spree/admin/orders_helper.rb +1 -1
  44. data/app/helpers/spree/admin/products_helper.rb +2 -4
  45. data/app/helpers/spree/admin/stock_movements_helper.rb +3 -3
  46. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +2 -2
  47. data/app/views/spree/admin/customer_returns/_reimbursements_table.html.erb +1 -1
  48. data/app/views/spree/admin/customer_returns/_return_item_selection.html.erb +1 -1
  49. data/app/views/spree/admin/customer_returns/edit.html.erb +1 -1
  50. data/app/views/spree/admin/images/edit.html.erb +1 -3
  51. data/app/views/spree/admin/images/index.html.erb +0 -2
  52. data/app/views/spree/admin/option_types/edit.html.erb +2 -4
  53. data/app/views/spree/admin/option_types/index.html.erb +0 -2
  54. data/app/views/spree/admin/option_types/new.html.erb +0 -2
  55. data/app/views/spree/admin/orders/_shipment_manifest.html.erb +1 -1
  56. data/app/views/spree/admin/orders/index.html.erb +1 -1
  57. data/app/views/spree/admin/product_properties/index.html.erb +0 -1
  58. data/app/views/spree/admin/products/edit.html.erb +0 -2
  59. data/app/views/spree/admin/products/index.html.erb +2 -4
  60. data/app/views/spree/admin/products/new.html.erb +0 -2
  61. data/app/views/spree/admin/promotion_categories/edit.html.erb +0 -2
  62. data/app/views/spree/admin/promotion_categories/index.html.erb +0 -2
  63. data/app/views/spree/admin/promotion_categories/new.html.erb +0 -2
  64. data/app/views/spree/admin/promotions/actions/_create_adjustment.html.erb +2 -28
  65. data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb +2 -26
  66. data/app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb +28 -0
  67. data/app/views/spree/admin/promotions/edit.html.erb +0 -2
  68. data/app/views/spree/admin/promotions/index.html.erb +0 -2
  69. data/app/views/spree/admin/promotions/new.html.erb +0 -2
  70. data/app/views/spree/admin/properties/edit.html.erb +0 -2
  71. data/app/views/spree/admin/properties/index.html.erb +2 -4
  72. data/app/views/spree/admin/properties/new.html.erb +0 -2
  73. data/app/views/spree/admin/properties/new.js.erb +1 -1
  74. data/app/views/spree/admin/prototypes/edit.html.erb +0 -2
  75. data/app/views/spree/admin/prototypes/index.html.erb +0 -2
  76. data/app/views/spree/admin/prototypes/new.html.erb +0 -2
  77. data/app/views/spree/admin/reimbursements/edit.html.erb +2 -2
  78. data/app/views/spree/admin/reimbursements/show.html.erb +9 -9
  79. data/app/views/spree/admin/return_authorizations/_form.html.erb +16 -16
  80. data/app/views/spree/admin/search/users.rabl +1 -1
  81. data/app/views/spree/admin/shared/_head.html.erb +11 -0
  82. data/app/views/spree/admin/shared/_header.html.erb +4 -8
  83. data/app/views/spree/admin/shared/_menu.html.erb +4 -8
  84. data/app/views/spree/admin/shared/_navigation.html.erb +9 -0
  85. data/app/views/spree/admin/shared/_navigation_footer.html.erb +3 -0
  86. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +20 -22
  87. data/app/views/spree/admin/shared/_promotion_sub_menu.html.erb +8 -10
  88. data/app/views/spree/admin/shared/_stock_sub_menu.html.erb +8 -10
  89. data/app/views/spree/admin/shared/_tabs.html.erb +9 -3
  90. data/app/views/spree/admin/shipping_methods/_form.html.erb +2 -2
  91. data/app/views/spree/admin/stock_items/index.html.erb +1 -2
  92. data/app/views/spree/admin/stock_transfers/edit.html.erb +0 -1
  93. data/app/views/spree/admin/stock_transfers/index.html.erb +0 -3
  94. data/app/views/spree/admin/stock_transfers/new.html.erb +0 -2
  95. data/app/views/spree/admin/stock_transfers/receive.html.erb +0 -2
  96. data/app/views/spree/admin/stock_transfers/show.html.erb +0 -2
  97. data/app/views/spree/admin/stock_transfers/tracking_info.html.erb +0 -2
  98. data/app/views/spree/admin/style_guide/index.html.erb +5 -0
  99. data/app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb +79 -0
  100. data/app/views/spree/admin/style_guide/topics/forms/_validation.html.erb +14 -0
  101. data/app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb +13 -0
  102. data/app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb +20 -0
  103. data/app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb +16 -0
  104. data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb +44 -0
  105. data/app/views/spree/admin/style_guide/topics/tables/_pagination.html.erb +11 -0
  106. data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb +64 -0
  107. data/app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb +19 -0
  108. data/app/views/spree/admin/style_guide/topics/typography/_icons.html.erb +13 -0
  109. data/app/views/spree/admin/style_guide/topics/typography/_lists.html.erb +25 -0
  110. data/app/views/spree/admin/style_guide/topics/typography/_tags.html.erb +25 -0
  111. data/app/views/spree/admin/taxonomies/_js_head.html.erb +0 -0
  112. data/app/views/spree/admin/taxonomies/edit.erb +5 -6
  113. data/app/views/spree/admin/taxonomies/index.html.erb +0 -2
  114. data/app/views/spree/admin/taxonomies/new.html.erb +0 -2
  115. data/app/views/spree/admin/taxons/_form.html.erb +1 -1
  116. data/app/views/spree/admin/taxons/_list_template.html.erb +17 -0
  117. data/app/views/spree/admin/taxons/index.html.erb +0 -3
  118. data/app/views/spree/admin/users/orders.html.erb +1 -1
  119. data/app/views/spree/admin/variants/edit.html.erb +0 -2
  120. data/app/views/spree/admin/variants/index.html.erb +0 -2
  121. data/app/views/spree/layouts/admin.html.erb +3 -4
  122. data/app/views/spree/layouts/admin_style_guide.html.erb +58 -0
  123. data/config/routes.rb +4 -2
  124. data/lib/spree/backend/engine.rb +0 -1
  125. data/lib/spree/backend.rb +0 -3
  126. data/solidus_backend.gemspec +5 -7
  127. data/spec/controllers/spree/admin/missing_products_controller_spec.rb +1 -1
  128. data/spec/controllers/spree/admin/orders_controller_spec.rb +14 -14
  129. data/spec/controllers/spree/admin/payment_methods_controller_spec.rb +2 -4
  130. data/spec/controllers/spree/admin/payments_controller_spec.rb +2 -2
  131. data/spec/controllers/spree/admin/products_controller_spec.rb +3 -3
  132. data/spec/controllers/spree/admin/reports_controller_spec.rb +4 -4
  133. data/spec/controllers/spree/admin/return_authorizations_controller_spec.rb +1 -1
  134. data/spec/controllers/spree/admin/shipping_methods_controller_spec.rb +1 -1
  135. data/spec/controllers/spree/admin/stock_locations_controller_spec.rb +1 -1
  136. data/spec/controllers/spree/admin/stock_transfers_controller_spec.rb +13 -11
  137. data/spec/features/admin/configuration/general_settings_spec.rb +10 -7
  138. data/spec/features/admin/configuration/payment_methods_spec.rb +1 -1
  139. data/spec/features/admin/configuration/shipping_methods_spec.rb +1 -1
  140. data/spec/features/admin/configuration/states_spec.rb +1 -1
  141. data/spec/features/admin/configuration/tax_rates_spec.rb +6 -7
  142. data/spec/features/admin/configuration/taxonomies_spec.rb +3 -3
  143. data/spec/features/admin/homepage_spec.rb +6 -6
  144. data/spec/features/admin/orders/cancelling_and_resuming_spec.rb +4 -8
  145. data/spec/features/admin/orders/customer_details_spec.rb +9 -8
  146. data/spec/features/admin/orders/line_items_spec.rb +1 -1
  147. data/spec/features/admin/orders/listing_spec.rb +2 -2
  148. data/spec/features/admin/orders/log_entries_spec.rb +3 -3
  149. data/spec/features/admin/orders/new_order_spec.rb +3 -15
  150. data/spec/features/admin/orders/order_details_spec.rb +17 -20
  151. data/spec/features/admin/orders/payments_spec.rb +10 -10
  152. data/spec/features/admin/orders/shipments_spec.rb +2 -2
  153. data/spec/features/admin/products/edit/images_spec.rb +5 -3
  154. data/spec/features/admin/products/edit/products_spec.rb +11 -11
  155. data/spec/features/admin/products/edit/taxons_spec.rb +14 -38
  156. data/spec/features/admin/products/edit/variants_spec.rb +3 -3
  157. data/spec/features/admin/products/option_types_spec.rb +22 -21
  158. data/spec/features/admin/products/products_spec.rb +15 -12
  159. data/spec/features/admin/products/properties_spec.rb +3 -3
  160. data/spec/features/admin/products/prototypes_spec.rb +4 -4
  161. data/spec/features/admin/products/stock_management_spec.rb +5 -5
  162. data/spec/features/admin/products/variant_spec.rb +8 -8
  163. data/spec/features/admin/promotion_adjustments_spec.rb +6 -13
  164. data/spec/features/admin/promotions/option_value_rule_spec.rb +0 -20
  165. data/spec/features/admin/reports_spec.rb +2 -2
  166. data/spec/features/admin/stock_transfer_spec.rb +3 -3
  167. data/spec/features/admin/store_credits_spec.rb +2 -2
  168. data/spec/features/admin/users_spec.rb +6 -6
  169. data/spec/helpers/admin/navigation_helper_spec.rb +5 -0
  170. data/spec/helpers/admin/reimbursements_helper_spec.rb +1 -1
  171. data/spec/helpers/admin/store_credit_events_helper_spec.rb +1 -1
  172. data/spec/spec_helper.rb +3 -1
  173. data/spec/support/feature/base_feature_helper.rb +10 -0
  174. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_aaaaaa_40x100.png +0 -0
  175. data/vendor/assets/images/jquery-ui/ui-bg_flat_0_eeeeee_40x100.png +0 -0
  176. data/vendor/assets/images/jquery-ui/ui-bg_flat_55_ffffff_40x100.png +0 -0
  177. data/vendor/assets/images/jquery-ui/ui-bg_flat_75_ffffff_40x100.png +0 -0
  178. data/vendor/assets/images/jquery-ui/ui-bg_glass_65_ffffff_1x400.png +0 -0
  179. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_100_f6f6f6_1x100.png +0 -0
  180. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_25_0073ea_1x100.png +0 -0
  181. data/vendor/assets/images/jquery-ui/ui-bg_highlight-soft_50_dddddd_1x100.png +0 -0
  182. data/vendor/assets/images/jquery-ui/ui-icons_0073ea_256x240.png +0 -0
  183. data/vendor/assets/images/jquery-ui/ui-icons_454545_256x240.png +0 -0
  184. data/vendor/assets/images/jquery-ui/ui-icons_666666_256x240.png +0 -0
  185. data/vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png +0 -0
  186. data/vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png +0 -0
  187. data/vendor/assets/javascripts/jquery.powertip.js +792 -423
  188. data/vendor/assets/javascripts/jquery.sticky-kit.min.js +10 -0
  189. data/vendor/assets/javascripts/prism.js +7 -0
  190. data/vendor/assets/stylesheets/prism.css +139 -0
  191. metadata +44 -51
  192. data/app/assets/stylesheets/spree/backend/plugins/_jstree.scss +0 -135
  193. data/app/views/spree/admin/shared/_sub_menu.html.erb +0 -9
  194. data/spec/features/admin/promotions/user_rule_spec.rb +0 -25
  195. data/vendor/assets/javascripts/equalize.js +0 -41
  196. data/vendor/assets/javascripts/jquery.jstree/jquery.jstree.js +0 -4540
  197. data/vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg +0 -0
  198. data/vendor/assets/javascripts/jquery.jstree/themes/apple/d.png +0 -0
  199. data/vendor/assets/javascripts/jquery.jstree/themes/apple/dot_for_ie.gif +0 -0
  200. data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.scss +0 -61
  201. data/vendor/assets/javascripts/jquery.jstree/themes/apple/throbber.gif +0 -0
  202. data/vendor/assets/javascripts/jquery.vAlign.js +0 -11
  203. data/vendor/assets/javascripts/modernizr.js +0 -4
  204. data/vendor/assets/javascripts/responsive-tables.js +0 -42
  205. data/vendor/assets/stylesheets/responsive-tables.css +0 -21
@@ -0,0 +1,10 @@
1
+ /*
2
+ Sticky-kit v1.1.2 | WTFPL | Leaf Corcoran 2015 | http://leafo.net
3
+ */
4
+ (function(){var c,f;c=this.jQuery||window.jQuery;f=c(window);c.fn.stick_in_parent=function(b){var A,w,J,n,B,K,p,q,L,k,E,t;null==b&&(b={});t=b.sticky_class;B=b.inner_scrolling;E=b.recalc_every;k=b.parent;q=b.offset_top;p=b.spacer;w=b.bottoming;null==q&&(q=0);null==k&&(k=void 0);null==B&&(B=!0);null==t&&(t="is_stuck");A=c(document);null==w&&(w=!0);L=function(a){var b;return window.getComputedStyle?(a=window.getComputedStyle(a[0]),b=parseFloat(a.getPropertyValue("width"))+parseFloat(a.getPropertyValue("margin-left"))+
5
+ parseFloat(a.getPropertyValue("margin-right")),"border-box"!==a.getPropertyValue("box-sizing")&&(b+=parseFloat(a.getPropertyValue("border-left-width"))+parseFloat(a.getPropertyValue("border-right-width"))+parseFloat(a.getPropertyValue("padding-left"))+parseFloat(a.getPropertyValue("padding-right"))),b):a.outerWidth(!0)};J=function(a,b,n,C,F,u,r,G){var v,H,m,D,I,d,g,x,y,z,h,l;if(!a.data("sticky_kit")){a.data("sticky_kit",!0);I=A.height();g=a.parent();null!=k&&(g=g.closest(k));if(!g.length)throw"failed to find stick parent";
6
+ v=m=!1;(h=null!=p?p&&a.closest(p):c("<div />"))&&h.css("position",a.css("position"));x=function(){var d,f,e;if(!G&&(I=A.height(),d=parseInt(g.css("border-top-width"),10),f=parseInt(g.css("padding-top"),10),b=parseInt(g.css("padding-bottom"),10),n=g.offset().top+d+f,C=g.height(),m&&(v=m=!1,null==p&&(a.insertAfter(h),h.detach()),a.css({position:"",top:"",width:"",bottom:""}).removeClass(t),e=!0),F=a.offset().top-(parseInt(a.css("margin-top"),10)||0)-q,u=a.outerHeight(!0),r=a.css("float"),h&&h.css({width:L(a),
7
+ height:u,display:a.css("display"),"vertical-align":a.css("vertical-align"),"float":r}),e))return l()};x();if(u!==C)return D=void 0,d=q,z=E,l=function(){var c,l,e,k;if(!G&&(e=!1,null!=z&&(--z,0>=z&&(z=E,x(),e=!0)),e||A.height()===I||x(),e=f.scrollTop(),null!=D&&(l=e-D),D=e,m?(w&&(k=e+u+d>C+n,v&&!k&&(v=!1,a.css({position:"fixed",bottom:"",top:d}).trigger("sticky_kit:unbottom"))),e<F&&(m=!1,d=q,null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.detach()),c={position:"",width:"",top:""},a.css(c).removeClass(t).trigger("sticky_kit:unstick")),
8
+ B&&(c=f.height(),u+q>c&&!v&&(d-=l,d=Math.max(c-u,d),d=Math.min(q,d),m&&a.css({top:d+"px"})))):e>F&&(m=!0,c={position:"fixed",top:d},c.width="border-box"===a.css("box-sizing")?a.outerWidth()+"px":a.width()+"px",a.css(c).addClass(t),null==p&&(a.after(h),"left"!==r&&"right"!==r||h.append(a)),a.trigger("sticky_kit:stick")),m&&w&&(null==k&&(k=e+u+d>C+n),!v&&k)))return v=!0,"static"===g.css("position")&&g.css({position:"relative"}),a.css({position:"absolute",bottom:b,top:"auto"}).trigger("sticky_kit:bottom")},
9
+ y=function(){x();return l()},H=function(){G=!0;f.off("touchmove",l);f.off("scroll",l);f.off("resize",y);c(document.body).off("sticky_kit:recalc",y);a.off("sticky_kit:detach",H);a.removeData("sticky_kit");a.css({position:"",bottom:"",top:"",width:""});g.position("position","");if(m)return null==p&&("left"!==r&&"right"!==r||a.insertAfter(h),h.remove()),a.removeClass(t)},f.on("touchmove",l),f.on("scroll",l),f.on("resize",y),c(document.body).on("sticky_kit:recalc",y),a.on("sticky_kit:detach",H),setTimeout(l,
10
+ 0)}};n=0;for(K=this.length;n<K;n++)b=this[n],J(c(b));return this}}).call(this);
@@ -0,0 +1,7 @@
1
+ /* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+ruby */
2
+ var _self="undefined"!=typeof window?window:"undefined"!=typeof WorkerGlobalScope&&self instanceof WorkerGlobalScope?self:{},Prism=function(){var e=/\blang(?:uage)?-(?!\*)(\w+)\b/i,t=_self.Prism={util:{encode:function(e){return e instanceof n?new n(e.type,t.util.encode(e.content),e.alias):"Array"===t.util.type(e)?e.map(t.util.encode):e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/\u00a0/g," ")},type:function(e){return Object.prototype.toString.call(e).match(/\[object (\w+)\]/)[1]},clone:function(e){var n=t.util.type(e);switch(n){case"Object":var a={};for(var r in e)e.hasOwnProperty(r)&&(a[r]=t.util.clone(e[r]));return a;case"Array":return e.map&&e.map(function(e){return t.util.clone(e)})}return e}},languages:{extend:function(e,n){var a=t.util.clone(t.languages[e]);for(var r in n)a[r]=n[r];return a},insertBefore:function(e,n,a,r){r=r||t.languages;var l=r[e];if(2==arguments.length){a=arguments[1];for(var i in a)a.hasOwnProperty(i)&&(l[i]=a[i]);return l}var o={};for(var s in l)if(l.hasOwnProperty(s)){if(s==n)for(var i in a)a.hasOwnProperty(i)&&(o[i]=a[i]);o[s]=l[s]}return t.languages.DFS(t.languages,function(t,n){n===r[e]&&t!=e&&(this[t]=o)}),r[e]=o},DFS:function(e,n,a){for(var r in e)e.hasOwnProperty(r)&&(n.call(e,r,e[r],a||r),"Object"===t.util.type(e[r])?t.languages.DFS(e[r],n):"Array"===t.util.type(e[r])&&t.languages.DFS(e[r],n,r))}},plugins:{},highlightAll:function(e,n){for(var a,r=document.querySelectorAll('code[class*="language-"], [class*="language-"] code, code[class*="lang-"], [class*="lang-"] code'),l=0;a=r[l++];)t.highlightElement(a,e===!0,n)},highlightElement:function(n,a,r){for(var l,i,o=n;o&&!e.test(o.className);)o=o.parentNode;o&&(l=(o.className.match(e)||[,""])[1],i=t.languages[l]),n.className=n.className.replace(e,"").replace(/\s+/g," ")+" language-"+l,o=n.parentNode,/pre/i.test(o.nodeName)&&(o.className=o.className.replace(e,"").replace(/\s+/g," ")+" language-"+l);var s=n.textContent,u={element:n,language:l,grammar:i,code:s};if(!s||!i)return t.hooks.run("complete",u),void 0;if(t.hooks.run("before-highlight",u),a&&_self.Worker){var g=new Worker(t.filename);g.onmessage=function(e){u.highlightedCode=e.data,t.hooks.run("before-insert",u),u.element.innerHTML=u.highlightedCode,r&&r.call(u.element),t.hooks.run("after-highlight",u),t.hooks.run("complete",u)},g.postMessage(JSON.stringify({language:u.language,code:u.code,immediateClose:!0}))}else u.highlightedCode=t.highlight(u.code,u.grammar,u.language),t.hooks.run("before-insert",u),u.element.innerHTML=u.highlightedCode,r&&r.call(n),t.hooks.run("after-highlight",u),t.hooks.run("complete",u)},highlight:function(e,a,r){var l=t.tokenize(e,a);return n.stringify(t.util.encode(l),r)},tokenize:function(e,n){var a=t.Token,r=[e],l=n.rest;if(l){for(var i in l)n[i]=l[i];delete n.rest}e:for(var i in n)if(n.hasOwnProperty(i)&&n[i]){var o=n[i];o="Array"===t.util.type(o)?o:[o];for(var s=0;s<o.length;++s){var u=o[s],g=u.inside,c=!!u.lookbehind,f=0,h=u.alias;u=u.pattern||u;for(var p=0;p<r.length;p++){var d=r[p];if(r.length>e.length)break e;if(!(d instanceof a)){u.lastIndex=0;var m=u.exec(d);if(m){c&&(f=m[1].length);var y=m.index-1+f,m=m[0].slice(f),v=m.length,k=y+v,b=d.slice(0,y+1),w=d.slice(k+1),P=[p,1];b&&P.push(b);var A=new a(i,g?t.tokenize(m,g):m,h);P.push(A),w&&P.push(w),Array.prototype.splice.apply(r,P)}}}}}return r},hooks:{all:{},add:function(e,n){var a=t.hooks.all;a[e]=a[e]||[],a[e].push(n)},run:function(e,n){var a=t.hooks.all[e];if(a&&a.length)for(var r,l=0;r=a[l++];)r(n)}}},n=t.Token=function(e,t,n){this.type=e,this.content=t,this.alias=n};if(n.stringify=function(e,a,r){if("string"==typeof e)return e;if("Array"===t.util.type(e))return e.map(function(t){return n.stringify(t,a,e)}).join("");var l={type:e.type,content:n.stringify(e.content,a,r),tag:"span",classes:["token",e.type],attributes:{},language:a,parent:r};if("comment"==l.type&&(l.attributes.spellcheck="true"),e.alias){var i="Array"===t.util.type(e.alias)?e.alias:[e.alias];Array.prototype.push.apply(l.classes,i)}t.hooks.run("wrap",l);var o="";for(var s in l.attributes)o+=(o?" ":"")+s+'="'+(l.attributes[s]||"")+'"';return"<"+l.tag+' class="'+l.classes.join(" ")+'" '+o+">"+l.content+"</"+l.tag+">"},!_self.document)return _self.addEventListener?(_self.addEventListener("message",function(e){var n=JSON.parse(e.data),a=n.language,r=n.code,l=n.immediateClose;_self.postMessage(t.highlight(r,t.languages[a],a)),l&&_self.close()},!1),_self.Prism):_self.Prism;var a=document.getElementsByTagName("script");return a=a[a.length-1],a&&(t.filename=a.src,document.addEventListener&&!a.hasAttribute("data-manual")&&document.addEventListener("DOMContentLoaded",t.highlightAll)),_self.Prism}();"undefined"!=typeof module&&module.exports&&(module.exports=Prism),"undefined"!=typeof global&&(global.Prism=Prism);
3
+ Prism.languages.markup={comment:/<!--[\w\W]*?-->/,prolog:/<\?[\w\W]+?\?>/,doctype:/<!DOCTYPE[\w\W]+?>/,cdata:/<!\[CDATA\[[\w\W]*?]]>/i,tag:{pattern:/<\/?(?!\d)[^\s>\/=.$<]+(?:\s+[^\s>\/=]+(?:=(?:("|')(?:\\\1|\\?(?!\1)[\w\W])*\1|[^\s'">=]+))?)*\s*\/?>/i,inside:{tag:{pattern:/^<\/?[^\s>\/]+/i,inside:{punctuation:/^<\/?/,namespace:/^[^\s>\/:]+:/}},"attr-value":{pattern:/=(?:('|")[\w\W]*?(\1)|[^\s>]+)/i,inside:{punctuation:/[=>"']/}},punctuation:/\/?>/,"attr-name":{pattern:/[^\s>\/]+/,inside:{namespace:/^[^\s>\/:]+:/}}}},entity:/&#?[\da-z]{1,8};/i},Prism.hooks.add("wrap",function(a){"entity"===a.type&&(a.attributes.title=a.content.replace(/&amp;/,"&"))}),Prism.languages.xml=Prism.languages.markup,Prism.languages.html=Prism.languages.markup,Prism.languages.mathml=Prism.languages.markup,Prism.languages.svg=Prism.languages.markup;
4
+ Prism.languages.css={comment:/\/\*[\w\W]*?\*\//,atrule:{pattern:/@[\w-]+?.*?(;|(?=\s*\{))/i,inside:{rule:/@[\w-]+/}},url:/url\((?:(["'])(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1|.*?)\)/i,selector:/[^\{\}\s][^\{\};]*?(?=\s*\{)/,string:/("|')(\\(?:\r\n|[\w\W])|(?!\1)[^\\\r\n])*\1/,property:/(\b|\B)[\w-]+(?=\s*:)/i,important:/\B!important\b/i,"function":/[-a-z0-9]+(?=\()/i,punctuation:/[(){};:]/},Prism.languages.css.atrule.inside.rest=Prism.util.clone(Prism.languages.css),Prism.languages.markup&&(Prism.languages.insertBefore("markup","tag",{style:{pattern:/(<style[\w\W]*?>)[\w\W]*?(?=<\/style>)/i,lookbehind:!0,inside:Prism.languages.css,alias:"language-css"}}),Prism.languages.insertBefore("inside","attr-value",{"style-attr":{pattern:/\s*style=("|').*?\1/i,inside:{"attr-name":{pattern:/^\s*style/i,inside:Prism.languages.markup.tag.inside},punctuation:/^\s*=\s*['"]|['"]\s*$/,"attr-value":{pattern:/.+/i,inside:Prism.languages.css}},alias:"language-css"}},Prism.languages.markup.tag));
5
+ Prism.languages.clike={comment:[{pattern:/(^|[^\\])\/\*[\w\W]*?\*\//,lookbehind:!0},{pattern:/(^|[^\\:])\/\/.*/,lookbehind:!0}],string:/(["'])(\\(?:\r\n|[\s\S])|(?!\1)[^\\\r\n])*\1/,"class-name":{pattern:/((?:\b(?:class|interface|extends|implements|trait|instanceof|new)\s+)|(?:catch\s+\())[a-z0-9_\.\\]+/i,lookbehind:!0,inside:{punctuation:/(\.|\\)/}},keyword:/\b(if|else|while|do|for|return|in|instanceof|function|new|try|throw|catch|finally|null|break|continue)\b/,"boolean":/\b(true|false)\b/,"function":/[a-z0-9_]+(?=\()/i,number:/\b-?(?:0x[\da-f]+|\d*\.?\d+(?:e[+-]?\d+)?)\b/i,operator:/--?|\+\+?|!=?=?|<=?|>=?|==?=?|&&?|\|\|?|\?|\*|\/|~|\^|%/,punctuation:/[{}[\];(),.:]/};
6
+ Prism.languages.javascript=Prism.languages.extend("clike",{keyword:/\b(as|async|await|break|case|catch|class|const|continue|debugger|default|delete|do|else|enum|export|extends|finally|for|from|function|get|if|implements|import|in|instanceof|interface|let|new|null|of|package|private|protected|public|return|set|static|super|switch|this|throw|try|typeof|var|void|while|with|yield)\b/,number:/\b-?(0x[\dA-Fa-f]+|0b[01]+|0o[0-7]+|\d*\.?\d+([Ee][+-]?\d+)?|NaN|Infinity)\b/,"function":/[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*(?=\()/i}),Prism.languages.insertBefore("javascript","keyword",{regex:{pattern:/(^|[^\/])\/(?!\/)(\[.+?]|\\.|[^\/\\\r\n])+\/[gimyu]{0,5}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}}),Prism.languages.insertBefore("javascript","class-name",{"template-string":{pattern:/`(?:\\`|\\?[^`])*`/,inside:{interpolation:{pattern:/\$\{[^}]+\}/,inside:{"interpolation-punctuation":{pattern:/^\$\{|\}$/,alias:"punctuation"},rest:Prism.languages.javascript}},string:/[\s\S]+/}}}),Prism.languages.markup&&Prism.languages.insertBefore("markup","tag",{script:{pattern:/(<script[\w\W]*?>)[\w\W]*?(?=<\/script>)/i,lookbehind:!0,inside:Prism.languages.javascript,alias:"language-javascript"}}),Prism.languages.js=Prism.languages.javascript;
7
+ !function(e){e.languages.ruby=e.languages.extend("clike",{comment:/#(?!\{[^\r\n]*?\}).*/,keyword:/\b(alias|and|BEGIN|begin|break|case|class|def|define_method|defined|do|each|else|elsif|END|end|ensure|false|for|if|in|module|new|next|nil|not|or|raise|redo|require|rescue|retry|return|self|super|then|throw|true|undef|unless|until|when|while|yield)\b/});var n={pattern:/#\{[^}]+\}/,inside:{delimiter:{pattern:/^#\{|\}$/,alias:"tag"},rest:e.util.clone(e.languages.ruby)}};e.languages.insertBefore("ruby","keyword",{regex:[{pattern:/%r([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\((?:[^()\\]|\\[\s\S])*\)[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}[gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r\[(?:[^\[\]\\]|\\[\s\S])*\][gim]{0,3}/,inside:{interpolation:n}},{pattern:/%r<(?:[^<>\\]|\\[\s\S])*>[gim]{0,3}/,inside:{interpolation:n}},{pattern:/(^|[^\/])\/(?!\/)(\[.+?]|\\.|[^\/\r\n])+\/[gim]{0,3}(?=\s*($|[\r\n,.;})]))/,lookbehind:!0}],variable:/[@$]+[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/,symbol:/:[a-zA-Z_][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.insertBefore("ruby","number",{builtin:/\b(Array|Bignum|Binding|Class|Continuation|Dir|Exception|FalseClass|File|Stat|File|Fixnum|Fload|Hash|Integer|IO|MatchData|Method|Module|NilClass|Numeric|Object|Proc|Range|Regexp|String|Struct|TMS|Symbol|ThreadGroup|Thread|Time|TrueClass)\b/,constant:/\b[A-Z][a-zA-Z_0-9]*(?:[?!]|\b)/}),e.languages.ruby.string=[{pattern:/%[qQiIwWxs]?([^a-zA-Z0-9\s\{\(\[<])(?:[^\\]|\\[\s\S])*?\1/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\((?:[^()\\]|\\[\s\S])*\)/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\{(?:[^#{}\\]|#(?:\{[^}]+\})?|\\[\s\S])*\}/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?\[(?:[^\[\]\\]|\\[\s\S])*\]/,inside:{interpolation:n}},{pattern:/%[qQiIwWxs]?<(?:[^<>\\]|\\[\s\S])*>/,inside:{interpolation:n}},{pattern:/("|')(#\{[^}]+\}|\\(?:\r?\n|\r)|\\?.)*?\1/,inside:{interpolation:n}}]}(Prism);
@@ -0,0 +1,139 @@
1
+ /* http://prismjs.com/download.html?themes=prism&languages=markup+css+clike+javascript+ruby */
2
+ /**
3
+ * prism.js default theme for JavaScript, CSS and HTML
4
+ * Based on dabblet (http://dabblet.com)
5
+ * @author Lea Verou
6
+ */
7
+
8
+ code[class*="language-"],
9
+ pre[class*="language-"] {
10
+ color: black;
11
+ text-shadow: 0 1px white;
12
+ font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
13
+ direction: ltr;
14
+ text-align: left;
15
+ white-space: pre;
16
+ word-spacing: normal;
17
+ word-break: normal;
18
+ word-wrap: normal;
19
+ line-height: 1.5;
20
+
21
+ -moz-tab-size: 4;
22
+ -o-tab-size: 4;
23
+ tab-size: 4;
24
+
25
+ -webkit-hyphens: none;
26
+ -moz-hyphens: none;
27
+ -ms-hyphens: none;
28
+ hyphens: none;
29
+ }
30
+
31
+ pre[class*="language-"]::-moz-selection, pre[class*="language-"] ::-moz-selection,
32
+ code[class*="language-"]::-moz-selection, code[class*="language-"] ::-moz-selection {
33
+ text-shadow: none;
34
+ background: #b3d4fc;
35
+ }
36
+
37
+ pre[class*="language-"]::selection, pre[class*="language-"] ::selection,
38
+ code[class*="language-"]::selection, code[class*="language-"] ::selection {
39
+ text-shadow: none;
40
+ background: #b3d4fc;
41
+ }
42
+
43
+ @media print {
44
+ code[class*="language-"],
45
+ pre[class*="language-"] {
46
+ text-shadow: none;
47
+ }
48
+ }
49
+
50
+ /* Code blocks */
51
+ pre[class*="language-"] {
52
+ padding: 1em;
53
+ margin: .5em 0;
54
+ overflow: auto;
55
+ }
56
+
57
+ :not(pre) > code[class*="language-"],
58
+ pre[class*="language-"] {
59
+ background: #f5f2f0;
60
+ }
61
+
62
+ /* Inline code */
63
+ :not(pre) > code[class*="language-"] {
64
+ padding: .1em;
65
+ border-radius: .3em;
66
+ white-space: normal;
67
+ }
68
+
69
+ .token.comment,
70
+ .token.prolog,
71
+ .token.doctype,
72
+ .token.cdata {
73
+ color: slategray;
74
+ }
75
+
76
+ .token.punctuation {
77
+ color: #999;
78
+ }
79
+
80
+ .namespace {
81
+ opacity: .7;
82
+ }
83
+
84
+ .token.property,
85
+ .token.tag,
86
+ .token.boolean,
87
+ .token.number,
88
+ .token.constant,
89
+ .token.symbol,
90
+ .token.deleted {
91
+ color: #905;
92
+ }
93
+
94
+ .token.selector,
95
+ .token.attr-name,
96
+ .token.string,
97
+ .token.char,
98
+ .token.builtin,
99
+ .token.inserted {
100
+ color: #690;
101
+ }
102
+
103
+ .token.operator,
104
+ .token.entity,
105
+ .token.url,
106
+ .language-css .token.string,
107
+ .style .token.string {
108
+ color: #a67f59;
109
+ background: hsla(0, 0%, 100%, .5);
110
+ }
111
+
112
+ .token.atrule,
113
+ .token.attr-value,
114
+ .token.keyword {
115
+ color: #07a;
116
+ }
117
+
118
+ .token.function {
119
+ color: #DD4A68;
120
+ }
121
+
122
+ .token.regex,
123
+ .token.important,
124
+ .token.variable {
125
+ color: #e90;
126
+ }
127
+
128
+ .token.important,
129
+ .token.bold {
130
+ font-weight: bold;
131
+ }
132
+ .token.italic {
133
+ font-style: italic;
134
+ }
135
+
136
+ .token.entity {
137
+ cursor: help;
138
+ }
139
+
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: solidus_backend
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.4
4
+ version: 1.2.0.beta1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Solidus Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-12-12 00:00:00.000000000 Z
11
+ date: 2016-01-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: solidus_api
@@ -16,70 +16,48 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 1.1.4
19
+ version: 1.2.0.beta1
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 1.1.4
26
+ version: 1.2.0.beta1
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: solidus_core
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 1.1.4
33
+ version: 1.2.0.beta1
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 1.1.4
40
+ version: 1.2.0.beta1
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: bourbon
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
45
  - - ">="
46
46
  - !ruby/object:Gem::Version
47
- version: '0'
48
- type: :runtime
49
- prerelease: false
50
- version_requirements: !ruby/object:Gem::Requirement
51
- requirements:
52
- - - ">="
53
- - !ruby/object:Gem::Version
54
- version: '0'
55
- - !ruby/object:Gem::Dependency
56
- name: sass-rails
57
- requirement: !ruby/object:Gem::Requirement
58
- requirements:
59
- - - ">="
47
+ version: '4'
48
+ - - "<"
60
49
  - !ruby/object:Gem::Version
61
- version: '0'
50
+ version: '6'
62
51
  type: :runtime
63
52
  prerelease: false
64
53
  version_requirements: !ruby/object:Gem::Requirement
65
54
  requirements:
66
55
  - - ">="
67
56
  - !ruby/object:Gem::Version
68
- version: '0'
69
- - !ruby/object:Gem::Dependency
70
- name: coffee-rails
71
- requirement: !ruby/object:Gem::Requirement
72
- requirements:
73
- - - ">="
57
+ version: '4'
58
+ - - "<"
74
59
  - !ruby/object:Gem::Version
75
- version: '0'
76
- type: :runtime
77
- prerelease: false
78
- version_requirements: !ruby/object:Gem::Requirement
79
- requirements:
80
- - - ">="
81
- - !ruby/object:Gem::Version
82
- version: '0'
60
+ version: '6'
83
61
  - !ruby/object:Gem::Dependency
84
62
  name: jquery-rails
85
63
  requirement: !ruby/object:Gem::Requirement
@@ -144,6 +122,7 @@ extra_rdoc_files: []
144
122
  files:
145
123
  - Gemfile
146
124
  - Rakefile
125
+ - app/assets/images/solidus-style-guide-logo.png
147
126
  - app/assets/javascripts/spree/backend.js
148
127
  - app/assets/javascripts/spree/backend/address_states.js
149
128
  - app/assets/javascripts/spree/backend/adjustments.js.coffee
@@ -159,6 +138,7 @@ files:
159
138
  - app/assets/javascripts/spree/backend/images/new.js.coffee
160
139
  - app/assets/javascripts/spree/backend/line_items.js.coffee
161
140
  - app/assets/javascripts/spree/backend/line_items_on_order_edit.js.erb
141
+ - app/assets/javascripts/spree/backend/navigation.coffee
162
142
  - app/assets/javascripts/spree/backend/nested-attribute.js
163
143
  - app/assets/javascripts/spree/backend/number_field_updater.coffee
164
144
  - app/assets/javascripts/spree/backend/option_type_autocomplete.js.erb
@@ -192,6 +172,7 @@ files:
192
172
  - app/assets/javascripts/spree/backend/stock_transfers/transfer_item_deleting.coffee
193
173
  - app/assets/javascripts/spree/backend/stock_transfers/variant_form.coffee
194
174
  - app/assets/javascripts/spree/backend/store_credits.js.coffee
175
+ - app/assets/javascripts/spree/backend/style_guide.coffee
195
176
  - app/assets/javascripts/spree/backend/taxon_autocomplete.js.erb
196
177
  - app/assets/javascripts/spree/backend/taxon_tree_menu.js.coffee
197
178
  - app/assets/javascripts/spree/backend/taxonomy.js.coffee
@@ -229,7 +210,7 @@ files:
229
210
  - app/assets/stylesheets/spree/backend/globals/_functions.scss
230
211
  - app/assets/stylesheets/spree/backend/globals/_variables.scss
231
212
  - app/assets/stylesheets/spree/backend/globals/_variables_override.scss
232
- - app/assets/stylesheets/spree/backend/plugins/_jstree.scss
213
+ - app/assets/stylesheets/spree/backend/globals/mixins/_caret.scss
233
214
  - app/assets/stylesheets/spree/backend/plugins/_powertip.scss
234
215
  - app/assets/stylesheets/spree/backend/plugins/_select2.scss
235
216
  - app/assets/stylesheets/spree/backend/plugins/_token-input.scss
@@ -245,7 +226,9 @@ files:
245
226
  - app/assets/stylesheets/spree/backend/sections/_stock_management.scss
246
227
  - app/assets/stylesheets/spree/backend/sections/_stock_transfers.scss
247
228
  - app/assets/stylesheets/spree/backend/sections/_store_credits.scss
229
+ - app/assets/stylesheets/spree/backend/sections/_style_guide.scss
248
230
  - app/assets/stylesheets/spree/backend/sections/_tax_zones.scss
231
+ - app/assets/stylesheets/spree/backend/sections/_taxonomies.scss
249
232
  - app/assets/stylesheets/spree/backend/sections/_taxons.scss
250
233
  - app/assets/stylesheets/spree/backend/sections/_transfer_items.scss
251
234
  - app/assets/stylesheets/spree/backend/sections/_users.scss
@@ -300,6 +283,7 @@ files:
300
283
  - app/controllers/spree/admin/stock_movements_controller.rb
301
284
  - app/controllers/spree/admin/stock_transfers_controller.rb
302
285
  - app/controllers/spree/admin/store_credits_controller.rb
286
+ - app/controllers/spree/admin/style_guide_controller.rb
303
287
  - app/controllers/spree/admin/tax_categories_controller.rb
304
288
  - app/controllers/spree/admin/tax_rates_controller.rb
305
289
  - app/controllers/spree/admin/taxonomies_controller.rb
@@ -432,6 +416,7 @@ files:
432
416
  - app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
433
417
  - app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
434
418
  - app/views/spree/admin/promotions/actions/_free_shipping.html.erb
419
+ - app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb
435
420
  - app/views/spree/admin/promotions/calculators/_default_fields.html.erb
436
421
  - app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
437
422
  - app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
@@ -495,6 +480,8 @@ files:
495
480
  - app/views/spree/admin/shared/_head.html.erb
496
481
  - app/views/spree/admin/shared/_header.html.erb
497
482
  - app/views/spree/admin/shared/_menu.html.erb
483
+ - app/views/spree/admin/shared/_navigation.html.erb
484
+ - app/views/spree/admin/shared/_navigation_footer.html.erb
498
485
  - app/views/spree/admin/shared/_new_resource_links.html.erb
499
486
  - app/views/spree/admin/shared/_number_field_update_actions.html.erb
500
487
  - app/views/spree/admin/shared/_number_field_update_cell.html.erb
@@ -510,7 +497,6 @@ files:
510
497
  - app/views/spree/admin/shared/_show_resource_links.html.erb
511
498
  - app/views/spree/admin/shared/_sidebar.html.erb
512
499
  - app/views/spree/admin/shared/_stock_sub_menu.html.erb
513
- - app/views/spree/admin/shared/_sub_menu.html.erb
514
500
  - app/views/spree/admin/shared/_table_filter.html.erb
515
501
  - app/views/spree/admin/shared/_tabs.html.erb
516
502
  - app/views/spree/admin/shared/_translations.html.erb
@@ -561,6 +547,19 @@ files:
561
547
  - app/views/spree/admin/store_credits/index.html.erb
562
548
  - app/views/spree/admin/store_credits/new.html.erb
563
549
  - app/views/spree/admin/store_credits/show.html.erb
550
+ - app/views/spree/admin/style_guide/index.html.erb
551
+ - app/views/spree/admin/style_guide/topics/forms/_building_forms.html.erb
552
+ - app/views/spree/admin/style_guide/topics/forms/_validation.html.erb
553
+ - app/views/spree/admin/style_guide/topics/messaging/_flashes.html.erb
554
+ - app/views/spree/admin/style_guide/topics/messaging/_loading.html.erb
555
+ - app/views/spree/admin/style_guide/topics/messaging/_tooltips.html.erb
556
+ - app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb
557
+ - app/views/spree/admin/style_guide/topics/tables/_pagination.html.erb
558
+ - app/views/spree/admin/style_guide/topics/typography/_colors.html.erb
559
+ - app/views/spree/admin/style_guide/topics/typography/_fonts.html.erb
560
+ - app/views/spree/admin/style_guide/topics/typography/_icons.html.erb
561
+ - app/views/spree/admin/style_guide/topics/typography/_lists.html.erb
562
+ - app/views/spree/admin/style_guide/topics/typography/_tags.html.erb
564
563
  - app/views/spree/admin/tax_categories/_form.html.erb
565
564
  - app/views/spree/admin/tax_categories/edit.html.erb
566
565
  - app/views/spree/admin/tax_categories/index.html.erb
@@ -578,6 +577,7 @@ files:
578
577
  - app/views/spree/admin/taxonomies/index.html.erb
579
578
  - app/views/spree/admin/taxonomies/new.html.erb
580
579
  - app/views/spree/admin/taxons/_form.html.erb
580
+ - app/views/spree/admin/taxons/_list_template.html.erb
581
581
  - app/views/spree/admin/taxons/_taxon_table.html.erb
582
582
  - app/views/spree/admin/taxons/edit.html.erb
583
583
  - app/views/spree/admin/taxons/index.html.erb
@@ -609,6 +609,7 @@ files:
609
609
  - app/views/spree/admin/zones/index.html.erb
610
610
  - app/views/spree/admin/zones/new.html.erb
611
611
  - app/views/spree/layouts/admin.html.erb
612
+ - app/views/spree/layouts/admin_style_guide.html.erb
612
613
  - config/initializers/assets.rb
613
614
  - config/initializers/form_builder.rb
614
615
  - config/routes.rb
@@ -690,7 +691,6 @@ files:
690
691
  - spec/features/admin/promotion_adjustments_spec.rb
691
692
  - spec/features/admin/promotions/option_value_rule_spec.rb
692
693
  - spec/features/admin/promotions/tiered_calculator_spec.rb
693
- - spec/features/admin/promotions/user_rule_spec.rb
694
694
  - spec/features/admin/reports_spec.rb
695
695
  - spec/features/admin/stock_transfer_spec.rb
696
696
  - spec/features/admin/store_credits_spec.rb
@@ -704,6 +704,7 @@ files:
704
704
  - spec/helpers/promotion_rules_helper_spec.rb
705
705
  - spec/spec_helper.rb
706
706
  - spec/support/appear_before_matcher.rb
707
+ - spec/support/feature/base_feature_helper.rb
707
708
  - spec/support/ror_ringer.jpeg
708
709
  - spec/test_views/spree/admin/widgets/edit.html.erb
709
710
  - spec/test_views/spree/admin/widgets/new.html.erb
@@ -721,23 +722,15 @@ files:
721
722
  - vendor/assets/images/jquery-ui/ui-icons_ff0084_256x240.png
722
723
  - vendor/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
723
724
  - vendor/assets/javascripts/backbone.js
724
- - vendor/assets/javascripts/equalize.js
725
725
  - vendor/assets/javascripts/jquery.cookie.js
726
- - vendor/assets/javascripts/jquery.jstree/jquery.jstree.js
727
- - vendor/assets/javascripts/jquery.jstree/themes/apple/bg.jpg
728
- - vendor/assets/javascripts/jquery.jstree/themes/apple/d.png
729
- - vendor/assets/javascripts/jquery.jstree/themes/apple/dot_for_ie.gif
730
- - vendor/assets/javascripts/jquery.jstree/themes/apple/style.scss
731
- - vendor/assets/javascripts/jquery.jstree/themes/apple/throbber.gif
732
726
  - vendor/assets/javascripts/jquery.powertip.js
733
- - vendor/assets/javascripts/jquery.vAlign.js
734
- - vendor/assets/javascripts/modernizr.js
735
- - vendor/assets/javascripts/responsive-tables.js
727
+ - vendor/assets/javascripts/jquery.sticky-kit.min.js
728
+ - vendor/assets/javascripts/prism.js
736
729
  - vendor/assets/javascripts/underscore-min.js
737
730
  - vendor/assets/stylesheets/bootstrap/components/_media.scss
738
731
  - vendor/assets/stylesheets/jquery-ui.datepicker.css.erb
739
732
  - vendor/assets/stylesheets/jquery.powertip.css
740
- - vendor/assets/stylesheets/responsive-tables.css
733
+ - vendor/assets/stylesheets/prism.css
741
734
  homepage: http://solidus.io
742
735
  licenses: []
743
736
  metadata: {}
@@ -752,13 +745,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
752
745
  version: 2.1.0
753
746
  required_rubygems_version: !ruby/object:Gem::Requirement
754
747
  requirements:
755
- - - ">="
748
+ - - ">"
756
749
  - !ruby/object:Gem::Version
757
- version: '0'
750
+ version: 1.3.1
758
751
  requirements:
759
752
  - none
760
753
  rubyforge_project: solidus_backend
761
- rubygems_version: 2.6.11
754
+ rubygems_version: 2.5.1
762
755
  signing_key:
763
756
  specification_version: 4
764
757
  summary: Admin interface for the Solidus e-commerce framework.
@@ -1,135 +0,0 @@
1
- #taxonomy_tree {
2
- > ul, .jstree-icon {
3
- background-image: none;
4
- }
5
-
6
- .jstree-icon {
7
- @extend [class^="icon-"]:before;
8
- @extend .fa;
9
- }
10
-
11
- .jstree-open > .jstree-icon {
12
- @extend .fa-caret-down;
13
- }
14
- .jstree-closed > .jstree-icon {
15
- @extend .fa-caret-right;
16
- }
17
-
18
- li {
19
- background-image: none;
20
-
21
- a {
22
- background-color: very-light($color-3);
23
- border: 1px solid $color-border;
24
- color: $color-body-text;
25
- font-weight: $font-weight-bold;
26
- text-shadow: none;
27
- width: 90%;
28
- height: auto;
29
- line-height: inherit;
30
- padding: 5px 0 5px 10px;
31
- margin-bottom: 10px;
32
-
33
- .jstree-icon {
34
- padding-left: 0px;
35
- @extend .fa;
36
- @extend .fa-arrows;
37
- }
38
- }
39
- }
40
- }
41
-
42
- #vakata-dragged.jstree-apple .jstree-invalid,
43
- #vakata-dragged.jstree-apple .jstree-ok,
44
- #jstree-marker {
45
- background-image: none !important;
46
- background-color: transparent !important;
47
- @extend [class^="icon-"]:before;
48
- }
49
- #vakata-dragged.jstree-apple .jstree-invalid {
50
- @extend .fa;
51
- @extend .fa-bars;
52
- color: $color-5;
53
- }
54
- #vakata-dragged.jstree-apple .jstree-ok {
55
- @extend .fa;
56
- @extend .fa-check;
57
- color: $color-2;
58
- }
59
-
60
- #jstree-marker {
61
- @extend .fa-caret-right;
62
- color: $color-body-text !important;
63
- width: 4px !important;
64
- }
65
-
66
- #jstree-marker-line {
67
- height: 0px !important;
68
- margin-left: 5px !important;
69
- margin-top: -2px !important;
70
- border: none !important;
71
- border-bottom: 1px solid $color-body-text !important;
72
-
73
- background-color: very-light($color-3) !important;
74
-
75
- -webkit-box-shadow: none !important;
76
- -moz-box-shadow: none !important;
77
- box-shadow: none !important;
78
-
79
- }
80
-
81
- #vakata-contextmenu {
82
- background-color: $color-3 !important;
83
- -moz-box-shadow: none !important;
84
- -webkit-box-shadow: none !important;
85
- box-shadow: none !important;
86
- border: none !important;
87
- border-radius: $border-radius !important;
88
-
89
- &:before {
90
- content: '';
91
- position: absolute;
92
- border-left: 10px solid transparent;
93
- border-right: 10px solid transparent;
94
- border-bottom: 10px solid $color-3;
95
- top: 0px;
96
- margin-top: -10px;
97
- left: 25px;
98
- z-index: 1;
99
- }
100
-
101
- a {
102
- color: $color-1 !important;
103
- line-height: inherit !important;
104
- padding: 5px 10px !important;
105
- margin: 0 !important;
106
- font-size: 90% !important;
107
-
108
- &:hover {
109
- background-color: $color-2 !important;
110
- border: none !important;
111
- border-radius: $border-radius !important;
112
- -moz-box-shadow: none !important;
113
- -webkit-box-shadow: none !important;
114
- line-height: inherit !important;
115
- padding: 5px 10px !important;
116
- margin: 0 !important;
117
- }
118
- }
119
-
120
- li:first-child a:hover:before {
121
- content: '';
122
- position: absolute;
123
- border-left: 10px solid transparent;
124
- border-right: 10px solid transparent;
125
- border-bottom: 10px solid $color-2;
126
- top: 0px;
127
- margin-top: -10px;
128
- left: 25px;
129
- z-index: 1;
130
- }
131
-
132
- li.vakata-separator {
133
- display: none;
134
- }
135
- }
@@ -1,9 +0,0 @@
1
- <% if content_for?(:sub_menu) %>
2
- <nav id="sub-menu" data-hook>
3
- <div class="container">
4
- <div class="sixteen columns">
5
- <%= yield :sub_menu %>
6
- </div>
7
- </div>
8
- </nav>
9
- <% end %>
@@ -1,25 +0,0 @@
1
- require 'spec_helper'
2
-
3
- feature 'Promotion with user rule', js: true do
4
- stub_authorization!
5
-
6
- given(:promotion) { create :promotion }
7
-
8
- background do
9
- visit spree.edit_admin_promotion_path(promotion)
10
- end
11
-
12
- context "with an attempted XSS" do
13
- let(:xss_string) { %(<script>throw("XSS")</script>) }
14
- given!(:user) { create(:user, email: xss_string) }
15
-
16
- scenario "adding an option value rule" do
17
- select2 "User", from: "Add rule of type"
18
- within("#rules_container") { click_button "Add" }
19
-
20
- select2_search "<script>", from: "Choose users"
21
-
22
- expect(page).to have_content(xss_string)
23
- end
24
- end
25
- end
@@ -1,41 +0,0 @@
1
- /**
2
- * equalize.js
3
- * Author & copyright (c) 2012: Tim Svensen
4
- * Dual MIT & GPL license
5
- *
6
- * Page: http://tsvensen.github.com/equalize.js
7
- * Repo: https://github.com/tsvensen/equalize.js/
8
- *
9
- * The jQuery plugin for equalizing the height or width of elements.
10
- *
11
- * Equalize will accept any of the jQuery Dimension methods:
12
- * height, outerHeight, innerHeight,
13
- * width, outerWidth, innerWidth.
14
- *
15
- * EXAMPLE
16
- * $('.parent').equalize(); // defaults to 'height'
17
- * $('.parent').equalize('width'); // equalize the widths
18
- */
19
- (function($, window, document, undefined) {
20
-
21
- $.fn.equalize = function(equalize) {
22
- var $containers = this, // this is the jQuery object
23
- equalize = equalize || 'height',
24
- type = (equalize.indexOf('eight') > 0) ? 'height' : 'width';
25
-
26
- if (!$.isFunction($.fn[equalize])) { return false; }
27
-
28
- return $containers.each(function() {
29
- var $children = $(this).children(),
30
- max = 0; // reset for each container
31
-
32
- $children.each(function() {
33
- var value = $(this)[equalize](); // call height(), outerHeight(), etc.
34
- if (value > max) { max = value; } // update max
35
- });
36
-
37
- $children.css(type, max +'px'); // add CSS to children
38
- });
39
- };
40
-
41
- }(jQuery, window, document));