spree_core 1.2.5 → 1.3.0.rc1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (817) hide show
  1. data/app/assets/javascripts/admin/address_states.js +5 -4
  2. data/app/assets/javascripts/admin/admin.js.erb +106 -58
  3. data/app/assets/javascripts/admin/calculator.js +2 -2
  4. data/app/assets/javascripts/admin/checkouts/edit.js +5 -5
  5. data/app/assets/javascripts/admin/image_settings.js.erb +62 -0
  6. data/app/assets/javascripts/admin/images/index.js.coffee +3 -0
  7. data/app/assets/javascripts/admin/images/new.js.coffee +3 -0
  8. data/app/assets/javascripts/admin/orders/edit.js +1 -1
  9. data/app/assets/javascripts/admin/progress.coffee +27 -0
  10. data/app/assets/javascripts/admin/shipping_methods.js.coffee +1 -1
  11. data/app/assets/javascripts/admin/spree-select2.js.erb +24 -0
  12. data/app/assets/javascripts/admin/spree_core.js +10 -0
  13. data/app/assets/javascripts/admin/taxon_autocomplete.js.erb +1 -1
  14. data/app/assets/javascripts/admin/taxonomy.js +9 -9
  15. data/app/assets/javascripts/admin/variant_autocomplete.js.erb +40 -0
  16. data/app/assets/javascripts/store/checkout.js.coffee +23 -5
  17. data/app/assets/javascripts/store/product.js.coffee +15 -8
  18. data/app/assets/javascripts/store/spree_core.js +0 -1
  19. data/app/assets/stylesheets/admin/components/_actions.scss +31 -0
  20. data/app/assets/stylesheets/admin/components/_date-picker.scss +154 -0
  21. data/app/assets/stylesheets/admin/components/_messages.scss +43 -0
  22. data/app/assets/stylesheets/admin/components/_navigation.scss +150 -0
  23. data/app/assets/stylesheets/admin/components/_pagination.scss +17 -0
  24. data/app/assets/stylesheets/admin/components/_product_autocomplete.scss +29 -0
  25. data/app/assets/stylesheets/admin/components/_progress.scss +35 -0
  26. data/app/assets/stylesheets/admin/components/_sidebar.scss +23 -0
  27. data/app/assets/stylesheets/admin/components/_states.scss +30 -0
  28. data/app/assets/stylesheets/admin/components/_table-filter.scss +14 -0
  29. data/app/assets/stylesheets/admin/globals/_functions.scss +25 -0
  30. data/app/assets/stylesheets/admin/globals/_mixins.scss +25 -0
  31. data/app/assets/stylesheets/admin/globals/_variables.scss +134 -0
  32. data/app/assets/stylesheets/admin/globals/_variables_override.scss +7 -0
  33. data/app/assets/stylesheets/admin/hacks/_ie.scss +73 -0
  34. data/app/assets/stylesheets/admin/hacks/_mozilla.scss +32 -0
  35. data/app/assets/stylesheets/admin/hacks/_opera.scss +17 -0
  36. data/app/assets/stylesheets/admin/plugins/_jstree.scss +132 -0
  37. data/app/assets/stylesheets/admin/plugins/_powertip.scss +86 -0
  38. data/app/assets/stylesheets/admin/plugins/_select2.scss +176 -0
  39. data/app/assets/stylesheets/admin/{token-input.css → plugins/_token-input.scss} +9 -8
  40. data/app/assets/stylesheets/admin/plugins/font-awesome.scss +303 -0
  41. data/app/assets/stylesheets/admin/{edit_checkouts.css → sections/_edit_checkouts.scss} +1 -1
  42. data/app/assets/stylesheets/admin/sections/_image_settings.scss +3 -0
  43. data/app/assets/stylesheets/admin/sections/_orders.scss +38 -0
  44. data/app/assets/stylesheets/admin/sections/_overview.scss +86 -0
  45. data/app/assets/stylesheets/admin/sections/_products.scss +26 -0
  46. data/app/assets/stylesheets/admin/sections/_promotions.scss +100 -0
  47. data/app/assets/stylesheets/admin/shared/_forms.scss +250 -0
  48. data/app/assets/stylesheets/admin/shared/_icons.scss +21 -0
  49. data/app/assets/stylesheets/admin/shared/_layout.scss +84 -0
  50. data/app/assets/stylesheets/admin/shared/_tables.scss +180 -0
  51. data/app/assets/stylesheets/admin/shared/_typography.scss +132 -0
  52. data/app/assets/stylesheets/admin/spree_admin.scss +38 -0
  53. data/app/assets/stylesheets/admin/spree_core.css +7 -7
  54. data/app/assets/stylesheets/store/screen.css.scss +57 -49
  55. data/app/assets/stylesheets/store/spree_core.css +2 -3
  56. data/app/assets/stylesheets/store/variables.css.scss +2 -0
  57. data/app/controllers/spree/admin/adjustments_controller.rb +3 -7
  58. data/app/controllers/spree/admin/base_controller.rb +1 -1
  59. data/app/controllers/spree/admin/countries_controller.rb +11 -0
  60. data/app/controllers/spree/admin/general_settings_controller.rb +7 -8
  61. data/app/controllers/spree/admin/image_settings_controller.rb +2 -7
  62. data/app/controllers/spree/admin/inventory_settings_controller.rb +2 -6
  63. data/app/controllers/spree/admin/mail_methods_controller.rb +1 -1
  64. data/app/controllers/spree/admin/orders/customer_details_controller.rb +3 -4
  65. data/app/controllers/spree/admin/orders_controller.rb +3 -9
  66. data/app/controllers/spree/admin/payment_methods_controller.rb +5 -2
  67. data/app/controllers/spree/admin/payments_controller.rb +4 -4
  68. data/app/controllers/spree/admin/product_properties_controller.rb +0 -12
  69. data/app/controllers/spree/admin/products_controller.rb +19 -42
  70. data/app/controllers/spree/admin/properties_controller.rb +2 -2
  71. data/app/controllers/spree/admin/prototypes_controller.rb +0 -8
  72. data/app/controllers/spree/admin/reports_controller.rb +7 -4
  73. data/app/controllers/spree/admin/resource_controller.rb +3 -3
  74. data/app/controllers/spree/admin/return_authorizations_controller.rb +1 -1
  75. data/app/controllers/spree/admin/shipments_controller.rb +3 -3
  76. data/app/controllers/spree/admin/shipping_methods_controller.rb +1 -1
  77. data/app/controllers/spree/admin/tax_categories_controller.rb +1 -1
  78. data/app/controllers/spree/admin/taxons_controller.rb +4 -4
  79. data/app/controllers/spree/admin/variants_controller.rb +11 -15
  80. data/app/controllers/spree/base_controller.rb +4 -1
  81. data/app/controllers/spree/checkout_controller.rb +3 -3
  82. data/app/controllers/spree/content_controller.rb +1 -1
  83. data/app/controllers/spree/countries_controller.rb +12 -0
  84. data/app/controllers/spree/home_controller.rb +2 -1
  85. data/app/controllers/spree/locale_controller.rb +3 -3
  86. data/app/controllers/spree/orders_controller.rb +7 -9
  87. data/app/controllers/spree/products_controller.rb +5 -4
  88. data/app/controllers/spree/states_controller.rb +1 -1
  89. data/app/controllers/spree/store_controller.rb +11 -0
  90. data/app/controllers/spree/taxons_controller.rb +2 -1
  91. data/app/helpers/spree/admin/base_helper.rb +16 -15
  92. data/app/helpers/spree/admin/navigation_helper.rb +38 -28
  93. data/app/helpers/spree/admin/orders_helper.rb +1 -7
  94. data/app/helpers/spree/admin/tables_helper.rb +15 -0
  95. data/app/helpers/spree/admin/taxons_helper.rb +0 -13
  96. data/app/helpers/spree/base_helper.rb +14 -28
  97. data/app/helpers/spree/checkout_helper.rb +0 -15
  98. data/app/helpers/spree/products_helper.rb +23 -10
  99. data/app/mailers/spree/order_mailer.rb +6 -17
  100. data/app/mailers/spree/shipment_mailer.rb +3 -8
  101. data/app/mailers/spree/test_mailer.rb +0 -5
  102. data/app/models/spree/address.rb +2 -1
  103. data/app/models/spree/adjustment.rb +5 -1
  104. data/app/models/spree/app_configuration.rb +2 -7
  105. data/app/models/spree/calculator/default_tax.rb +2 -6
  106. data/app/models/spree/calculator/flat_rate.rb +3 -1
  107. data/app/models/spree/calculator/flexi_rate.rb +2 -1
  108. data/app/models/spree/calculator/per_item.rb +3 -4
  109. data/app/models/spree/calculator/price_sack.rb +3 -1
  110. data/app/models/spree/country.rb +11 -0
  111. data/app/models/spree/credit_card.rb +5 -1
  112. data/app/models/spree/gateway.rb +2 -8
  113. data/app/models/spree/image.rb +1 -1
  114. data/app/models/spree/inventory_unit.rb +7 -3
  115. data/app/models/spree/line_item.rb +16 -2
  116. data/app/models/spree/order.rb +64 -137
  117. data/app/models/spree/order/checkout.rb +1 -8
  118. data/app/models/spree/order_updater.rb +134 -0
  119. data/app/models/spree/payment.rb +8 -19
  120. data/app/models/spree/payment/processing.rb +3 -3
  121. data/app/models/spree/payment_method.rb +6 -4
  122. data/app/models/spree/preference.rb +1 -1
  123. data/app/models/spree/preferences/preferable_class_methods.rb +9 -6
  124. data/app/models/spree/preferences/store.rb +11 -26
  125. data/app/models/spree/price.rb +51 -0
  126. data/app/models/spree/product.rb +22 -14
  127. data/app/models/spree/product/scopes.rb +20 -28
  128. data/app/models/spree/prototype.rb +1 -1
  129. data/app/models/spree/return_authorization.rb +8 -0
  130. data/app/models/spree/shipment.rb +13 -5
  131. data/app/models/spree/shipping_method.rb +10 -1
  132. data/app/models/spree/shipping_rate.rb +2 -2
  133. data/app/models/spree/taxon.rb +0 -5
  134. data/app/models/spree/variant.rb +75 -25
  135. data/app/models/spree/zone.rb +1 -1
  136. data/app/views/spree/address/_form.html.erb +75 -0
  137. data/app/views/spree/admin/adjustments/_adjustments_table.html.erb +23 -22
  138. data/app/views/spree/admin/adjustments/_form.html.erb +15 -12
  139. data/app/views/spree/admin/adjustments/edit.html.erb +15 -6
  140. data/app/views/spree/admin/adjustments/index.html.erb +12 -2
  141. data/app/views/spree/admin/adjustments/new.html.erb +15 -6
  142. data/app/views/spree/admin/banners/_gateway.html.erb +3 -1
  143. data/app/views/spree/admin/countries/_form.html.erb +22 -0
  144. data/app/views/spree/admin/countries/edit.html.erb +21 -0
  145. data/app/views/spree/admin/countries/index.html.erb +33 -0
  146. data/app/views/spree/admin/general_settings/edit.html.erb +75 -27
  147. data/app/views/spree/admin/image_settings/edit.html.erb +112 -99
  148. data/app/views/spree/admin/images/_form.html.erb +16 -12
  149. data/app/views/spree/admin/images/edit.html.erb +20 -11
  150. data/app/views/spree/admin/images/index.html.erb +70 -46
  151. data/app/views/spree/admin/images/new.html.erb +11 -8
  152. data/app/views/spree/admin/inventory_settings/edit.html.erb +16 -18
  153. data/app/views/spree/admin/inventory_settings/show.html.erb +14 -4
  154. data/app/views/spree/admin/line_items/create.js.erb +0 -3
  155. data/app/views/spree/admin/mail_methods/_form.html.erb +46 -47
  156. data/app/views/spree/admin/mail_methods/edit.html.erb +12 -3
  157. data/app/views/spree/admin/mail_methods/index.html.erb +37 -33
  158. data/app/views/spree/admin/mail_methods/new.html.erb +16 -4
  159. data/app/views/spree/admin/option_types/_form.html.erb +16 -12
  160. data/app/views/spree/admin/option_types/_option_value_fields.html.erb +7 -3
  161. data/app/views/spree/admin/option_types/edit.html.erb +45 -27
  162. data/app/views/spree/admin/option_types/index.html.erb +31 -26
  163. data/app/views/spree/admin/option_types/new.html.erb +1 -1
  164. data/app/views/spree/admin/orders/_add_product.html.erb +13 -10
  165. data/app/views/spree/admin/orders/_form.html.erb +53 -42
  166. data/app/views/spree/admin/orders/_line_item.html.erb +7 -9
  167. data/app/views/spree/admin/orders/customer_details/_form.html.erb +59 -41
  168. data/app/views/spree/admin/orders/customer_details/edit.html.erb +11 -2
  169. data/app/views/spree/admin/orders/edit.html.erb +5 -8
  170. data/app/views/spree/admin/orders/index.html.erb +105 -67
  171. data/app/views/spree/admin/orders/new.html.erb +16 -5
  172. data/app/views/spree/admin/orders/show.html.erb +23 -14
  173. data/app/views/spree/admin/payment_methods/_form.html.erb +46 -45
  174. data/app/views/spree/admin/payment_methods/edit.html.erb +19 -6
  175. data/app/views/spree/admin/payment_methods/index.html.erb +33 -27
  176. data/app/views/spree/admin/payment_methods/new.html.erb +16 -5
  177. data/app/views/spree/admin/payments/_form.html.erb +27 -16
  178. data/app/views/spree/admin/payments/_list.html.erb +23 -19
  179. data/app/views/spree/admin/payments/credit.html.erb +4 -0
  180. data/app/views/spree/admin/payments/index.html.erb +12 -11
  181. data/app/views/spree/admin/payments/new.html.erb +13 -7
  182. data/app/views/spree/admin/payments/show.html.erb +13 -5
  183. data/app/views/spree/admin/payments/source_forms/_gateway.html.erb +36 -26
  184. data/app/views/spree/admin/payments/source_views/_gateway.html.erb +26 -31
  185. data/app/views/spree/admin/product_properties/_product_property_fields.html.erb +3 -1
  186. data/app/views/spree/admin/product_properties/index.html.erb +37 -30
  187. data/app/views/spree/admin/products/_form.html.erb +115 -87
  188. data/app/views/spree/admin/products/_properties_form.erb +6 -3
  189. data/app/views/spree/admin/products/edit.html.erb +8 -2
  190. data/app/views/spree/admin/products/index.html.erb +88 -55
  191. data/app/views/spree/admin/products/new.html.erb +24 -20
  192. data/app/views/spree/admin/products/new.js.erb +4 -0
  193. data/app/views/spree/admin/properties/_form.html.erb +15 -12
  194. data/app/views/spree/admin/properties/edit.html.erb +11 -3
  195. data/app/views/spree/admin/properties/index.html.erb +18 -17
  196. data/app/views/spree/admin/properties/new.html.erb +4 -2
  197. data/app/views/spree/admin/prototypes/_form.html.erb +22 -43
  198. data/app/views/spree/admin/prototypes/_prototypes.html.erb +7 -3
  199. data/app/views/spree/admin/prototypes/edit.html.erb +14 -3
  200. data/app/views/spree/admin/prototypes/index.html.erb +19 -16
  201. data/app/views/spree/admin/prototypes/new.html.erb +1 -1
  202. data/app/views/spree/admin/prototypes/new.js.erb +3 -0
  203. data/app/views/spree/admin/reports/index.html.erb +3 -1
  204. data/app/views/spree/admin/reports/sales_total.html.erb +31 -17
  205. data/app/views/spree/admin/return_authorizations/_form.html.erb +36 -27
  206. data/app/views/spree/admin/return_authorizations/edit.html.erb +16 -17
  207. data/app/views/spree/admin/return_authorizations/index.html.erb +47 -40
  208. data/app/views/spree/admin/return_authorizations/new.html.erb +5 -3
  209. data/app/views/spree/admin/shared/_address.html.erb +2 -2
  210. data/app/views/spree/admin/shared/_address_form.html.erb +58 -78
  211. data/app/views/spree/admin/shared/_calculator_fields.html.erb +16 -13
  212. data/app/views/spree/admin/shared/_configuration_menu.html.erb +23 -19
  213. data/app/views/spree/admin/shared/_edit_resource_links.html.erb +5 -4
  214. data/app/views/spree/admin/shared/_head.html.erb +10 -2
  215. data/app/views/spree/admin/shared/_new_resource_links.html.erb +5 -4
  216. data/app/views/spree/admin/shared/_order_details.html.erb +16 -15
  217. data/app/views/spree/admin/shared/_order_tabs.html.erb +65 -51
  218. data/app/views/spree/admin/shared/_product_sub_menu.html.erb +2 -2
  219. data/app/views/spree/admin/shared/_product_tabs.html.erb +23 -20
  220. data/app/views/spree/admin/shared/_report_criteria.html.erb +13 -11
  221. data/app/views/spree/admin/shared/_routes.html.erb +1 -2
  222. data/app/views/spree/admin/shared/_tabs.html.erb +5 -4
  223. data/app/views/spree/admin/shared/_translations.html.erb +22 -18
  224. data/app/views/spree/admin/shipments/_form.html.erb +54 -58
  225. data/app/views/spree/admin/shipments/edit.html.erb +20 -15
  226. data/app/views/spree/admin/shipments/index.html.erb +40 -33
  227. data/app/views/spree/admin/shipments/new.html.erb +4 -0
  228. data/app/views/spree/admin/shipping_categories/_form.html.erb +4 -6
  229. data/app/views/spree/admin/shipping_categories/edit.html.erb +17 -3
  230. data/app/views/spree/admin/shipping_categories/index.html.erb +18 -14
  231. data/app/views/spree/admin/shipping_categories/new.html.erb +15 -3
  232. data/app/views/spree/admin/shipping_methods/_form.html.erb +36 -24
  233. data/app/views/spree/admin/shipping_methods/edit.html.erb +18 -5
  234. data/app/views/spree/admin/shipping_methods/index.html.erb +21 -15
  235. data/app/views/spree/admin/shipping_methods/new.html.erb +18 -6
  236. data/app/views/spree/admin/states/_form.html.erb +13 -10
  237. data/app/views/spree/admin/states/_state_list.html.erb +10 -14
  238. data/app/views/spree/admin/states/edit.html.erb +13 -3
  239. data/app/views/spree/admin/states/index.html.erb +12 -4
  240. data/app/views/spree/admin/states/new.html.erb +9 -3
  241. data/app/views/spree/admin/tax_categories/_form.html.erb +23 -15
  242. data/app/views/spree/admin/tax_categories/edit.html.erb +11 -3
  243. data/app/views/spree/admin/tax_categories/index.html.erb +20 -15
  244. data/app/views/spree/admin/tax_categories/new.html.erb +12 -3
  245. data/app/views/spree/admin/tax_rates/_form.html.erb +38 -27
  246. data/app/views/spree/admin/tax_rates/edit.html.erb +18 -3
  247. data/app/views/spree/admin/tax_rates/index.html.erb +59 -40
  248. data/app/views/spree/admin/tax_rates/new.html.erb +20 -3
  249. data/app/views/spree/admin/tax_settings/edit.html.erb +10 -9
  250. data/app/views/spree/admin/taxonomies/_form.html.erb +1 -1
  251. data/app/views/spree/admin/taxonomies/_list.html.erb +24 -18
  252. data/app/views/spree/admin/taxonomies/edit.erb +24 -10
  253. data/app/views/spree/admin/taxonomies/get_children.json.erb +1 -1
  254. data/app/views/spree/admin/taxonomies/index.html.erb +8 -9
  255. data/app/views/spree/admin/taxonomies/new.html.erb +15 -5
  256. data/app/views/spree/admin/taxons/_form.html.erb +23 -18
  257. data/app/views/spree/admin/taxons/_taxon_table.html.erb +1 -1
  258. data/app/views/spree/admin/taxons/edit.html.erb +13 -5
  259. data/app/views/spree/admin/trackers/_form.html.erb +29 -24
  260. data/app/views/spree/admin/trackers/edit.html.erb +15 -3
  261. data/app/views/spree/admin/trackers/index.html.erb +43 -31
  262. data/app/views/spree/admin/trackers/new.html.erb +14 -3
  263. data/app/views/spree/admin/variants/_autocomplete.js.erb +30 -0
  264. data/app/views/spree/admin/variants/_form.html.erb +50 -31
  265. data/app/views/spree/admin/variants/index.html.erb +64 -46
  266. data/app/views/spree/admin/variants/new.html.erb +1 -0
  267. data/app/views/spree/admin/variants/new.js.erb +1 -0
  268. data/app/views/spree/admin/variants/search.rabl +15 -0
  269. data/app/views/spree/admin/zones/_country_member.html.erb +1 -1
  270. data/app/views/spree/admin/zones/_form.html.erb +30 -27
  271. data/app/views/spree/admin/zones/_member_type.html.erb +12 -9
  272. data/app/views/spree/admin/zones/_state_member.html.erb +2 -2
  273. data/app/views/spree/admin/zones/edit.html.erb +16 -3
  274. data/app/views/spree/admin/zones/index.html.erb +45 -36
  275. data/app/views/spree/admin/zones/new.html.erb +12 -1
  276. data/app/views/spree/checkout/_address.html.erb +17 -165
  277. data/app/views/spree/checkout/_confirm.html.erb +1 -1
  278. data/app/views/spree/checkout/_delivery.html.erb +1 -1
  279. data/app/views/spree/checkout/_payment.html.erb +1 -1
  280. data/app/views/spree/checkout/_summary.html.erb +4 -4
  281. data/app/views/spree/checkout/edit.html.erb +2 -0
  282. data/app/views/spree/checkout/payment/_gateway.html.erb +2 -2
  283. data/app/views/spree/checkout/registration.html.erb +1 -1
  284. data/app/views/spree/countries/index.js.erb +1 -0
  285. data/app/views/spree/layouts/admin.html.erb +125 -61
  286. data/app/views/spree/layouts/spree_application.html.erb +17 -6
  287. data/app/views/spree/order_mailer/cancel_email.text.erb +4 -4
  288. data/app/views/spree/order_mailer/confirm_email.text.erb +3 -3
  289. data/app/views/spree/orders/_adjustments.html.erb +1 -1
  290. data/app/views/spree/orders/_line_item.html.erb +3 -3
  291. data/app/views/spree/orders/show.html.erb +15 -15
  292. data/app/views/spree/products/_cart_form.html.erb +5 -5
  293. data/app/views/spree/products/_properties.html.erb +4 -3
  294. data/app/views/spree/products/_thumbnails.html.erb +15 -17
  295. data/app/views/spree/products/index.html.erb +1 -1
  296. data/app/views/spree/products/show.html.erb +1 -1
  297. data/app/views/spree/shared/_google_analytics.html.erb +9 -9
  298. data/app/views/spree/shared/_order_details.html.erb +14 -14
  299. data/app/views/spree/shared/_products.html.erb +1 -2
  300. data/app/views/spree/taxons/show.html.erb +1 -1
  301. data/config/locales/en.yml +43 -4
  302. data/config/routes.rb +4 -5
  303. data/db/migrate/20120831092320_spree_one_two.rb +481 -0
  304. data/db/migrate/20120929093553_remove_unused_preference_columns.rb +8 -0
  305. data/db/migrate/20121010142909_add_states_required_to_countries.rb +5 -0
  306. data/db/migrate/20121012071449_add_on_demand_to_product_and_variant.rb +6 -0
  307. data/db/migrate/20121031162139_split_prices_from_variants.rb +30 -0
  308. data/db/migrate/20121107003422_remove_not_null_from_spree_prices_amount.rb +9 -0
  309. data/db/migrate/20121107184631_add_currency_to_line_items.rb +5 -0
  310. data/db/migrate/20121107194006_add_currency_to_orders.rb +5 -0
  311. data/db/migrate/20121109173623_add_cost_currency_to_variants.rb +5 -0
  312. data/db/migrate/20121111231553_remove_display_on_from_payment_methods.rb +5 -0
  313. data/lib/generators/spree/custom_user/custom_user_generator.rb +1 -1
  314. data/lib/generators/spree/dummy/templates/rails/database.yml +6 -9
  315. data/lib/generators/spree/install/templates/config/initializers/spree.rb +2 -2
  316. data/lib/spree/core.rb +0 -7
  317. data/lib/spree/core/action_callbacks.rb +4 -4
  318. data/lib/spree/core/calculated_adjustments.rb +2 -2
  319. data/lib/spree/core/controller_helpers/auth.rb +65 -0
  320. data/lib/spree/core/controller_helpers/common.rb +90 -0
  321. data/lib/spree/core/controller_helpers/order.rb +71 -0
  322. data/lib/spree/core/{respond_with.rb → controller_helpers/respond_with.rb} +27 -25
  323. data/lib/spree/core/engine.rb +6 -5
  324. data/lib/spree/core/search/base.rb +3 -1
  325. data/lib/spree/core/testing_support/factories/payment_factory.rb +24 -0
  326. data/lib/spree/core/testing_support/factories/payment_method_factory.rb +0 -3
  327. data/lib/spree/core/testing_support/factories/price_factory.rb +8 -0
  328. data/lib/spree/core/testing_support/factories/zone_factory.rb +1 -1
  329. data/lib/spree/core/testing_support/flash.rb +17 -5
  330. data/lib/spree/core/testing_support/preferences.rb +6 -12
  331. data/lib/spree/core/validators/email.rb +1 -1
  332. data/lib/spree/core/version.rb +1 -1
  333. data/lib/spree/money.rb +3 -12
  334. data/lib/spree/product_filters.rb +8 -8
  335. data/lib/tasks/core.rake +3 -3
  336. data/lib/tasks/taxon.rake +1 -1
  337. data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
  338. data/vendor/assets/fonts/fontawesome-webfont.svg +255 -0
  339. data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
  340. data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
  341. data/vendor/assets/images/flags/ad.png +0 -0
  342. data/vendor/assets/images/flags/ae.png +0 -0
  343. data/vendor/assets/images/flags/af.png +0 -0
  344. data/vendor/assets/images/flags/ag.png +0 -0
  345. data/vendor/assets/images/flags/ai.png +0 -0
  346. data/vendor/assets/images/flags/al.png +0 -0
  347. data/vendor/assets/images/flags/am.png +0 -0
  348. data/vendor/assets/images/flags/an.png +0 -0
  349. data/vendor/assets/images/flags/ao.png +0 -0
  350. data/vendor/assets/images/flags/ar.png +0 -0
  351. data/vendor/assets/images/flags/as.png +0 -0
  352. data/vendor/assets/images/flags/at.png +0 -0
  353. data/vendor/assets/images/flags/au.png +0 -0
  354. data/vendor/assets/images/flags/aw.png +0 -0
  355. data/vendor/assets/images/flags/ax.png +0 -0
  356. data/vendor/assets/images/flags/az.png +0 -0
  357. data/vendor/assets/images/flags/ba.png +0 -0
  358. data/vendor/assets/images/flags/bb.png +0 -0
  359. data/vendor/assets/images/flags/bd.png +0 -0
  360. data/vendor/assets/images/flags/be.png +0 -0
  361. data/vendor/assets/images/flags/bf.png +0 -0
  362. data/vendor/assets/images/flags/bg.png +0 -0
  363. data/vendor/assets/images/flags/bh.png +0 -0
  364. data/vendor/assets/images/flags/bi.png +0 -0
  365. data/vendor/assets/images/flags/bj.png +0 -0
  366. data/vendor/assets/images/flags/bm.png +0 -0
  367. data/vendor/assets/images/flags/bn.png +0 -0
  368. data/vendor/assets/images/flags/bo.png +0 -0
  369. data/vendor/assets/images/flags/br.png +0 -0
  370. data/vendor/assets/images/flags/bs.png +0 -0
  371. data/vendor/assets/images/flags/bt.png +0 -0
  372. data/vendor/assets/images/flags/bv.png +0 -0
  373. data/vendor/assets/images/flags/bw.png +0 -0
  374. data/vendor/assets/images/flags/by.png +0 -0
  375. data/vendor/assets/images/flags/bz.png +0 -0
  376. data/vendor/assets/images/flags/ca.png +0 -0
  377. data/vendor/assets/images/flags/catalonia.png +0 -0
  378. data/vendor/assets/images/flags/cc.png +0 -0
  379. data/vendor/assets/images/flags/cd.png +0 -0
  380. data/vendor/assets/images/flags/cf.png +0 -0
  381. data/vendor/assets/images/flags/cg.png +0 -0
  382. data/vendor/assets/images/flags/ch.png +0 -0
  383. data/vendor/assets/images/flags/ci.png +0 -0
  384. data/vendor/assets/images/flags/ck.png +0 -0
  385. data/vendor/assets/images/flags/cl.png +0 -0
  386. data/vendor/assets/images/flags/cm.png +0 -0
  387. data/vendor/assets/images/flags/cn.png +0 -0
  388. data/vendor/assets/images/flags/co.png +0 -0
  389. data/vendor/assets/images/flags/cr.png +0 -0
  390. data/vendor/assets/images/flags/cs.png +0 -0
  391. data/vendor/assets/images/flags/cu.png +0 -0
  392. data/vendor/assets/images/flags/cv.png +0 -0
  393. data/vendor/assets/images/flags/cx.png +0 -0
  394. data/vendor/assets/images/flags/cy.png +0 -0
  395. data/vendor/assets/images/flags/cz.png +0 -0
  396. data/vendor/assets/images/flags/de.png +0 -0
  397. data/vendor/assets/images/flags/dj.png +0 -0
  398. data/vendor/assets/images/flags/dk.png +0 -0
  399. data/vendor/assets/images/flags/dm.png +0 -0
  400. data/vendor/assets/images/flags/do.png +0 -0
  401. data/vendor/assets/images/flags/dz.png +0 -0
  402. data/vendor/assets/images/flags/ec.png +0 -0
  403. data/vendor/assets/images/flags/ee.png +0 -0
  404. data/vendor/assets/images/flags/eg.png +0 -0
  405. data/vendor/assets/images/flags/eh.png +0 -0
  406. data/vendor/assets/images/flags/england.png +0 -0
  407. data/vendor/assets/images/flags/er.png +0 -0
  408. data/vendor/assets/images/flags/es.png +0 -0
  409. data/vendor/assets/images/flags/et.png +0 -0
  410. data/vendor/assets/images/flags/europeanunion.png +0 -0
  411. data/vendor/assets/images/flags/fam.png +0 -0
  412. data/vendor/assets/images/flags/fi.png +0 -0
  413. data/vendor/assets/images/flags/fj.png +0 -0
  414. data/vendor/assets/images/flags/fk.png +0 -0
  415. data/vendor/assets/images/flags/fm.png +0 -0
  416. data/vendor/assets/images/flags/fo.png +0 -0
  417. data/vendor/assets/images/flags/fr.png +0 -0
  418. data/vendor/assets/images/flags/ga.png +0 -0
  419. data/vendor/assets/images/flags/gb.png +0 -0
  420. data/vendor/assets/images/flags/gd.png +0 -0
  421. data/vendor/assets/images/flags/ge.png +0 -0
  422. data/vendor/assets/images/flags/gf.png +0 -0
  423. data/vendor/assets/images/flags/gh.png +0 -0
  424. data/vendor/assets/images/flags/gi.png +0 -0
  425. data/vendor/assets/images/flags/gl.png +0 -0
  426. data/vendor/assets/images/flags/gm.png +0 -0
  427. data/vendor/assets/images/flags/gn.png +0 -0
  428. data/vendor/assets/images/flags/gp.png +0 -0
  429. data/vendor/assets/images/flags/gq.png +0 -0
  430. data/vendor/assets/images/flags/gr.png +0 -0
  431. data/vendor/assets/images/flags/gs.png +0 -0
  432. data/vendor/assets/images/flags/gt.png +0 -0
  433. data/vendor/assets/images/flags/gu.png +0 -0
  434. data/vendor/assets/images/flags/gw.png +0 -0
  435. data/vendor/assets/images/flags/gy.png +0 -0
  436. data/vendor/assets/images/flags/hk.png +0 -0
  437. data/vendor/assets/images/flags/hm.png +0 -0
  438. data/vendor/assets/images/flags/hn.png +0 -0
  439. data/vendor/assets/images/flags/hr.png +0 -0
  440. data/vendor/assets/images/flags/ht.png +0 -0
  441. data/vendor/assets/images/flags/hu.png +0 -0
  442. data/vendor/assets/images/flags/id.png +0 -0
  443. data/vendor/assets/images/flags/ie.png +0 -0
  444. data/vendor/assets/images/flags/il.png +0 -0
  445. data/vendor/assets/images/flags/in.png +0 -0
  446. data/vendor/assets/images/flags/io.png +0 -0
  447. data/vendor/assets/images/flags/iq.png +0 -0
  448. data/vendor/assets/images/flags/ir.png +0 -0
  449. data/vendor/assets/images/flags/is.png +0 -0
  450. data/vendor/assets/images/flags/it.png +0 -0
  451. data/vendor/assets/images/flags/ja.png +0 -0
  452. data/vendor/assets/images/flags/jm.png +0 -0
  453. data/vendor/assets/images/flags/jo.png +0 -0
  454. data/vendor/assets/images/flags/ke.png +0 -0
  455. data/vendor/assets/images/flags/kg.png +0 -0
  456. data/vendor/assets/images/flags/kh.png +0 -0
  457. data/vendor/assets/images/flags/ki.png +0 -0
  458. data/vendor/assets/images/flags/km.png +0 -0
  459. data/vendor/assets/images/flags/kn.png +0 -0
  460. data/vendor/assets/images/flags/kp.png +0 -0
  461. data/vendor/assets/images/flags/kr.png +0 -0
  462. data/vendor/assets/images/flags/kw.png +0 -0
  463. data/vendor/assets/images/flags/ky.png +0 -0
  464. data/vendor/assets/images/flags/kz.png +0 -0
  465. data/vendor/assets/images/flags/la.png +0 -0
  466. data/vendor/assets/images/flags/lb.png +0 -0
  467. data/vendor/assets/images/flags/lc.png +0 -0
  468. data/vendor/assets/images/flags/li.png +0 -0
  469. data/vendor/assets/images/flags/lk.png +0 -0
  470. data/vendor/assets/images/flags/lr.png +0 -0
  471. data/vendor/assets/images/flags/ls.png +0 -0
  472. data/vendor/assets/images/flags/lt.png +0 -0
  473. data/vendor/assets/images/flags/lu.png +0 -0
  474. data/vendor/assets/images/flags/lv.png +0 -0
  475. data/vendor/assets/images/flags/ly.png +0 -0
  476. data/vendor/assets/images/flags/ma.png +0 -0
  477. data/vendor/assets/images/flags/mc.png +0 -0
  478. data/vendor/assets/images/flags/md.png +0 -0
  479. data/vendor/assets/images/flags/me.png +0 -0
  480. data/vendor/assets/images/flags/mg.png +0 -0
  481. data/vendor/assets/images/flags/mh.png +0 -0
  482. data/vendor/assets/images/flags/mk.png +0 -0
  483. data/vendor/assets/images/flags/ml.png +0 -0
  484. data/vendor/assets/images/flags/mm.png +0 -0
  485. data/vendor/assets/images/flags/mn.png +0 -0
  486. data/vendor/assets/images/flags/mo.png +0 -0
  487. data/vendor/assets/images/flags/mp.png +0 -0
  488. data/vendor/assets/images/flags/mq.png +0 -0
  489. data/vendor/assets/images/flags/mr.png +0 -0
  490. data/vendor/assets/images/flags/ms.png +0 -0
  491. data/vendor/assets/images/flags/mt.png +0 -0
  492. data/vendor/assets/images/flags/mu.png +0 -0
  493. data/vendor/assets/images/flags/mv.png +0 -0
  494. data/vendor/assets/images/flags/mw.png +0 -0
  495. data/vendor/assets/images/flags/mx.png +0 -0
  496. data/vendor/assets/images/flags/my.png +0 -0
  497. data/vendor/assets/images/flags/mz.png +0 -0
  498. data/vendor/assets/images/flags/na.png +0 -0
  499. data/vendor/assets/images/flags/nc.png +0 -0
  500. data/vendor/assets/images/flags/ne.png +0 -0
  501. data/vendor/assets/images/flags/nf.png +0 -0
  502. data/vendor/assets/images/flags/ng.png +0 -0
  503. data/vendor/assets/images/flags/ni.png +0 -0
  504. data/vendor/assets/images/flags/nl.png +0 -0
  505. data/vendor/assets/images/flags/no.png +0 -0
  506. data/vendor/assets/images/flags/np.png +0 -0
  507. data/vendor/assets/images/flags/nr.png +0 -0
  508. data/vendor/assets/images/flags/nu.png +0 -0
  509. data/vendor/assets/images/flags/nz.png +0 -0
  510. data/vendor/assets/images/flags/om.png +0 -0
  511. data/vendor/assets/images/flags/pa.png +0 -0
  512. data/vendor/assets/images/flags/pe.png +0 -0
  513. data/vendor/assets/images/flags/pf.png +0 -0
  514. data/vendor/assets/images/flags/pg.png +0 -0
  515. data/vendor/assets/images/flags/ph.png +0 -0
  516. data/vendor/assets/images/flags/pk.png +0 -0
  517. data/vendor/assets/images/flags/pl.png +0 -0
  518. data/vendor/assets/images/flags/pm.png +0 -0
  519. data/vendor/assets/images/flags/pn.png +0 -0
  520. data/vendor/assets/images/flags/pr.png +0 -0
  521. data/vendor/assets/images/flags/ps.png +0 -0
  522. data/vendor/assets/images/flags/pt.png +0 -0
  523. data/vendor/assets/images/flags/pw.png +0 -0
  524. data/vendor/assets/images/flags/py.png +0 -0
  525. data/vendor/assets/images/flags/qa.png +0 -0
  526. data/vendor/assets/images/flags/re.png +0 -0
  527. data/vendor/assets/images/flags/ro.png +0 -0
  528. data/vendor/assets/images/flags/rs.png +0 -0
  529. data/vendor/assets/images/flags/ru.png +0 -0
  530. data/vendor/assets/images/flags/rw.png +0 -0
  531. data/vendor/assets/images/flags/sa.png +0 -0
  532. data/vendor/assets/images/flags/sb.png +0 -0
  533. data/vendor/assets/images/flags/sc.png +0 -0
  534. data/vendor/assets/images/flags/scotland.png +0 -0
  535. data/vendor/assets/images/flags/sd.png +0 -0
  536. data/vendor/assets/images/flags/se.png +0 -0
  537. data/vendor/assets/images/flags/sg.png +0 -0
  538. data/vendor/assets/images/flags/sh.png +0 -0
  539. data/vendor/assets/images/flags/si.png +0 -0
  540. data/vendor/assets/images/flags/sj.png +0 -0
  541. data/vendor/assets/images/flags/sk.png +0 -0
  542. data/vendor/assets/images/flags/sl.png +0 -0
  543. data/vendor/assets/images/flags/sm.png +0 -0
  544. data/vendor/assets/images/flags/sn.png +0 -0
  545. data/vendor/assets/images/flags/so.png +0 -0
  546. data/vendor/assets/images/flags/sr.png +0 -0
  547. data/vendor/assets/images/flags/st.png +0 -0
  548. data/vendor/assets/images/flags/sv.png +0 -0
  549. data/vendor/assets/images/flags/sy.png +0 -0
  550. data/vendor/assets/images/flags/sz.png +0 -0
  551. data/vendor/assets/images/flags/tc.png +0 -0
  552. data/vendor/assets/images/flags/td.png +0 -0
  553. data/vendor/assets/images/flags/tf.png +0 -0
  554. data/vendor/assets/images/flags/tg.png +0 -0
  555. data/vendor/assets/images/flags/th.png +0 -0
  556. data/vendor/assets/images/flags/tj.png +0 -0
  557. data/vendor/assets/images/flags/tk.png +0 -0
  558. data/vendor/assets/images/flags/tl.png +0 -0
  559. data/vendor/assets/images/flags/tm.png +0 -0
  560. data/vendor/assets/images/flags/tn.png +0 -0
  561. data/vendor/assets/images/flags/to.png +0 -0
  562. data/vendor/assets/images/flags/tr.png +0 -0
  563. data/vendor/assets/images/flags/tt.png +0 -0
  564. data/vendor/assets/images/flags/tv.png +0 -0
  565. data/vendor/assets/images/flags/tw.png +0 -0
  566. data/vendor/assets/images/flags/tz.png +0 -0
  567. data/vendor/assets/images/flags/ua.png +0 -0
  568. data/vendor/assets/images/flags/ug.png +0 -0
  569. data/vendor/assets/images/flags/um.png +0 -0
  570. data/vendor/assets/images/flags/us.png +0 -0
  571. data/vendor/assets/images/flags/uy.png +0 -0
  572. data/vendor/assets/images/flags/uz.png +0 -0
  573. data/vendor/assets/images/flags/va.png +0 -0
  574. data/vendor/assets/images/flags/vc.png +0 -0
  575. data/vendor/assets/images/flags/ve.png +0 -0
  576. data/vendor/assets/images/flags/vg.png +0 -0
  577. data/vendor/assets/images/flags/vi.png +0 -0
  578. data/vendor/assets/images/flags/vn.png +0 -0
  579. data/vendor/assets/images/flags/vu.png +0 -0
  580. data/vendor/assets/images/flags/wales.png +0 -0
  581. data/vendor/assets/images/flags/wf.png +0 -0
  582. data/vendor/assets/images/flags/ws.png +0 -0
  583. data/vendor/assets/images/flags/ye.png +0 -0
  584. data/vendor/assets/images/flags/yt.png +0 -0
  585. data/vendor/assets/images/flags/za.png +0 -0
  586. data/vendor/assets/images/flags/zm.png +0 -0
  587. data/vendor/assets/images/flags/zw.png +0 -0
  588. data/vendor/assets/javascripts/css_browser_selector_dev.js +156 -0
  589. data/vendor/assets/javascripts/equalize.js +41 -0
  590. data/vendor/assets/javascripts/handlebars.js +1920 -0
  591. data/vendor/assets/javascripts/jquery.adaptivemenu.js +60 -0
  592. data/vendor/assets/javascripts/jquery.horizontalNav.js +141 -0
  593. data/vendor/assets/javascripts/jquery.jstree/themes/apple/style.css +3 -3
  594. data/vendor/assets/javascripts/jquery.powertip.js +796 -0
  595. data/vendor/assets/javascripts/jquery.vAlign.js +11 -0
  596. data/vendor/assets/javascripts/modernizr.js +4 -0
  597. data/vendor/assets/javascripts/responsive-tables.js +42 -0
  598. data/vendor/assets/javascripts/spin.js +319 -0
  599. data/vendor/assets/javascripts/trunk8.js +233 -0
  600. data/vendor/assets/stylesheets/font-awesome-ie7.css +645 -0
  601. data/vendor/assets/stylesheets/jquery.powertip.css +85 -0
  602. data/vendor/assets/stylesheets/normalize.css +375 -0
  603. data/vendor/assets/stylesheets/responsive-tables.css +21 -0
  604. data/vendor/assets/stylesheets/skeleton.css +4 -4
  605. metadata +394 -281
  606. checksums.yaml +0 -7
  607. data/app/assets/images/admin/bg/active-tab.png +0 -0
  608. data/app/assets/images/admin/bg/admin_tab_back.png +0 -0
  609. data/app/assets/images/admin/bg/admin_tab_selected_back.png +0 -0
  610. data/app/assets/images/admin/bg/content-back-blue.png +0 -0
  611. data/app/assets/images/admin/bg/content-back-green.png +0 -0
  612. data/app/assets/images/admin/bg/content-back.png +0 -0
  613. data/app/assets/images/admin/bg/flash-error.png +0 -0
  614. data/app/assets/images/admin/bg/flash-notice.png +0 -0
  615. data/app/assets/images/admin/bg/green-stripes.gif +0 -0
  616. data/app/assets/images/admin/bg/green-stripes.png +0 -0
  617. data/app/assets/images/admin/bg/grid_header_back.png +0 -0
  618. data/app/assets/images/admin/bg/grid_header_back_green.png +0 -0
  619. data/app/assets/images/admin/bg/header-bg.png +0 -0
  620. data/app/assets/images/admin/bg/header.png +0 -0
  621. data/app/assets/images/admin/bg/header_bg.jpg +0 -0
  622. data/app/assets/images/admin/bg/menu-current.png +0 -0
  623. data/app/assets/images/admin/bg/red-stripes.gif +0 -0
  624. data/app/assets/images/admin/bg/red-stripes.png +0 -0
  625. data/app/assets/images/admin/bg/subnav-divider.png +0 -0
  626. data/app/assets/images/admin/bg/subnav.png +0 -0
  627. data/app/assets/images/admin/bg/tab-back.png +0 -0
  628. data/app/assets/images/admin/buttons/blue/left_01.png +0 -0
  629. data/app/assets/images/admin/buttons/blue/right_01.png +0 -0
  630. data/app/assets/images/admin/buttons/drag-handle-green.png +0 -0
  631. data/app/assets/images/admin/buttons/green/left_01.png +0 -0
  632. data/app/assets/images/admin/buttons/green/right_01.png +0 -0
  633. data/app/assets/images/admin/buttons/left_01.png +0 -0
  634. data/app/assets/images/admin/buttons/left_01_small.png +0 -0
  635. data/app/assets/images/admin/buttons/orange/left_03.png +0 -0
  636. data/app/assets/images/admin/buttons/orange/right_03.png +0 -0
  637. data/app/assets/images/admin/buttons/right_01.png +0 -0
  638. data/app/assets/images/admin/buttons/right_01_small.png +0 -0
  639. data/app/assets/images/admin/icons/16x16/1.png +0 -0
  640. data/app/assets/images/admin/icons/16x16/10.png +0 -0
  641. data/app/assets/images/admin/icons/16x16/2.png +0 -0
  642. data/app/assets/images/admin/icons/16x16/3.png +0 -0
  643. data/app/assets/images/admin/icons/16x16/4.png +0 -0
  644. data/app/assets/images/admin/icons/16x16/5.png +0 -0
  645. data/app/assets/images/admin/icons/16x16/6.png +0 -0
  646. data/app/assets/images/admin/icons/16x16/7.png +0 -0
  647. data/app/assets/images/admin/icons/16x16/8.png +0 -0
  648. data/app/assets/images/admin/icons/16x16/9.png +0 -0
  649. data/app/assets/images/admin/icons/32x32/1.png +0 -0
  650. data/app/assets/images/admin/icons/32x32/10.png +0 -0
  651. data/app/assets/images/admin/icons/32x32/11.png +0 -0
  652. data/app/assets/images/admin/icons/32x32/2.png +0 -0
  653. data/app/assets/images/admin/icons/32x32/3.png +0 -0
  654. data/app/assets/images/admin/icons/32x32/4.png +0 -0
  655. data/app/assets/images/admin/icons/32x32/5.png +0 -0
  656. data/app/assets/images/admin/icons/32x32/6.png +0 -0
  657. data/app/assets/images/admin/icons/32x32/7.png +0 -0
  658. data/app/assets/images/admin/icons/32x32/8.png +0 -0
  659. data/app/assets/images/admin/icons/32x32/9.png +0 -0
  660. data/app/assets/images/admin/icons/accept.png +0 -0
  661. data/app/assets/images/admin/icons/add.gif +0 -0
  662. data/app/assets/images/admin/icons/add.png +0 -0
  663. data/app/assets/images/admin/icons/arrow-down.gif +0 -0
  664. data/app/assets/images/admin/icons/cross.png +0 -0
  665. data/app/assets/images/admin/icons/delete.gif +0 -0
  666. data/app/assets/images/admin/icons/delete.png +0 -0
  667. data/app/assets/images/admin/icons/drag.gif +0 -0
  668. data/app/assets/images/admin/icons/edit.gif +0 -0
  669. data/app/assets/images/admin/icons/edit.png +0 -0
  670. data/app/assets/images/admin/icons/email.png +0 -0
  671. data/app/assets/images/admin/icons/error.png +0 -0
  672. data/app/assets/images/admin/icons/exclamation.png +0 -0
  673. data/app/assets/images/admin/icons/feed.png +0 -0
  674. data/app/assets/images/admin/icons/pdf.png +0 -0
  675. data/app/assets/images/admin/icons/reorder.gif +0 -0
  676. data/app/assets/images/admin/icons/search.gif +0 -0
  677. data/app/assets/images/admin/icons/send-email.png +0 -0
  678. data/app/assets/images/admin/icons/stop.png +0 -0
  679. data/app/assets/images/admin/icons/switch.png +0 -0
  680. data/app/assets/images/admin/icons/tick.png +0 -0
  681. data/app/assets/images/admin/icons/up.gif +0 -0
  682. data/app/assets/images/admin/icons/xls.png +0 -0
  683. data/app/assets/images/credit_cards/icons/diners_club.png +0 -0
  684. data/app/assets/javascripts/admin/image_settings.js +0 -49
  685. data/app/assets/javascripts/admin/product_autocomplete.js.erb +0 -117
  686. data/app/assets/stylesheets/admin/admin-form.css.erb +0 -167
  687. data/app/assets/stylesheets/admin/admin-reset.css +0 -69
  688. data/app/assets/stylesheets/admin/admin-tables.css.erb +0 -40
  689. data/app/assets/stylesheets/admin/admin-typography.css +0 -117
  690. data/app/assets/stylesheets/admin/admin.css.erb +0 -682
  691. data/app/controllers/spree/admin/configurations_controller.rb +0 -7
  692. data/app/controllers/spree/admin/mail_settings_controller.rb +0 -17
  693. data/app/controllers/spree/admin/option_values_controller.rb +0 -11
  694. data/app/helpers/spree/account_helper.rb +0 -4
  695. data/app/helpers/spree/admin/overview_helper.rb +0 -16
  696. data/app/helpers/spree/admin/users_helper.rb +0 -10
  697. data/app/helpers/spree/admin/zones_helper.rb +0 -15
  698. data/app/helpers/spree/orders_helper.rb +0 -5
  699. data/app/helpers/spree/search_helper.rb +0 -12
  700. data/app/helpers/spree/trackers_helper.rb +0 -4
  701. data/app/views/spree/admin/configurations/index.html.erb +0 -68
  702. data/app/views/spree/admin/general_settings/show.html.erb +0 -40
  703. data/app/views/spree/admin/image_settings/show.html.erb +0 -11
  704. data/app/views/spree/admin/shared/_new_adjustment_button.html.erb +0 -8
  705. data/app/views/spree/admin/shared/_order_sub_menu.html.erb +0 -0
  706. data/app/views/spree/admin/tax_settings/show.html.erb +0 -14
  707. data/config/initializers/rails_3_1.rb +0 -12
  708. data/db/migrate/20090823005402_spree_zero_nine_zero.rb +0 -391
  709. data/db/migrate/20090904192342_create_indexes_for_inventory_units.rb +0 -6
  710. data/db/migrate/20090923100315_add_count_on_hand_to_variants_and_products.rb +0 -49
  711. data/db/migrate/20091007134354_change_taxons_to_nested_set.rb +0 -46
  712. data/db/migrate/20091008091614_move_to_configurable_gateways.rb +0 -54
  713. data/db/migrate/20091015110842_add_open_id_authentication_tables.rb +0 -15
  714. data/db/migrate/20091015153048_add_openid_field_to_users.rb +0 -26
  715. data/db/migrate/20091016174634_change_preference_value_type.rb +0 -10
  716. data/db/migrate/20091017175558_create_billing_integrations.rb +0 -12
  717. data/db/migrate/20091021133257_charge_refactoring.rb +0 -39
  718. data/db/migrate/20091104151730_add_some_indexes.rb +0 -11
  719. data/db/migrate/20091126190904_checkout_state_machine.rb +0 -5
  720. data/db/migrate/20091209153045_state_for_shipments.rb +0 -5
  721. data/db/migrate/20091209202200_make_state_events_polymorphic.rb +0 -12
  722. data/db/migrate/20091211203813_ship_address_id_for_checkouts.rb +0 -5
  723. data/db/migrate/20091212161118_shipping_method_id_for_checkouts.rb +0 -5
  724. data/db/migrate/20091213222815_creditcard_last_four_digits.rb +0 -14
  725. data/db/migrate/20091214183826_populate_legacy_shipment_state.rb +0 -15
  726. data/db/migrate/20100105090147_add_cost_price.rb +0 -5
  727. data/db/migrate/20100105132138_shipment_id_for_inventory_units.rb +0 -25
  728. data/db/migrate/20100111205525_cim_fields_for_creditcards.rb +0 -6
  729. data/db/migrate/20100112151511_create_return_authorizations.rb +0 -12
  730. data/db/migrate/20100113090919_add_return_authorization_to_inventory_units.rb +0 -5
  731. data/db/migrate/20100113203104_create_trackers.rb +0 -10
  732. data/db/migrate/20100121160010_creditcard_id_for_creditcard_txns.rb +0 -5
  733. data/db/migrate/20100121183934_original_creditcard_txn_id_for_creditcard_txns.rb +0 -5
  734. data/db/migrate/20100125145351_add_test_mode_to_billing_integration.rb +0 -6
  735. data/db/migrate/20100209025806_create_payment_methods.rb +0 -16
  736. data/db/migrate/20100209144531_polymorphic_payments.rb +0 -42
  737. data/db/migrate/20100213103131_change_payments_payment_method_to_belongs_to.rb +0 -11
  738. data/db/migrate/20100214212536_assign_creditcard_txns_to_payment.rb +0 -23
  739. data/db/migrate/20100223170312_sti_for_transactions.rb +0 -15
  740. data/db/migrate/20100223183812_drop_billing_integrations.rb +0 -16
  741. data/db/migrate/20100224153127_deleted_at_for_payment_methods.rb +0 -14
  742. data/db/migrate/20100301163454_add_adjustments_index.rb +0 -6
  743. data/db/migrate/20100317120946_add_alt_text_to_images.rb +0 -5
  744. data/db/migrate/20100419194457_fix_existing_coupon_credits.rb +0 -13
  745. data/db/migrate/20100427121301_add_display_to_payment_methods.rb +0 -5
  746. data/db/migrate/20100504142133_add_addresses_checkouts_indexes.rb +0 -8
  747. data/db/migrate/20100506180619_add_icon_to_taxons.rb +0 -17
  748. data/db/migrate/20100506185838_add_description_to_taxons.rb +0 -11
  749. data/db/migrate/20100528155333_index_for_shipments_number.rb +0 -5
  750. data/db/migrate/20100528185820_add_index_on_users_persistence_token.rb +0 -7
  751. data/db/migrate/20100605152042_add_default_to_tax_categories.rb +0 -5
  752. data/db/migrate/20100624110730_add_display_to_shipping_methods.rb +0 -5
  753. data/db/migrate/20100624123336_rename_payment_method_display.rb +0 -5
  754. data/db/migrate/20100624175547_rename_preferences_field.rb +0 -5
  755. data/db/migrate/20100811163637_add_guest_flag.rb +0 -7
  756. data/db/migrate/20100811205836_drop_order_token.rb +0 -9
  757. data/db/migrate/20100812162326_payments_state_and_assigned_to_order_only.rb +0 -14
  758. data/db/migrate/20100813023502_create_address_keys_for_order.rb +0 -6
  759. data/db/migrate/20100813185745_payment_total_for_orders.rb +0 -5
  760. data/db/migrate/20100816212146_shipping_method_id_for_orders.rb +0 -5
  761. data/db/migrate/20100817152723_add_shipment_and_payment_state.rb +0 -6
  762. data/db/migrate/20100819170125_refactor_adjustments.rb +0 -29
  763. data/db/migrate/20100820135707_response_code_and_avs_response_for_payments.rb +0 -6
  764. data/db/migrate/20100901171814_change_guest_flag_to_anonymous.rb +0 -7
  765. data/db/migrate/20100903203949_email_for_orders.rb +0 -5
  766. data/db/migrate/20100923162011_create_mail_methods.rb +0 -10
  767. data/db/migrate/20100929151905_rename_frozen_to_locked.rb +0 -5
  768. data/db/migrate/20101008190536_move_special_instructions_to_orders.rb +0 -10
  769. data/db/migrate/20101026184700_create_log_entries.rb +0 -11
  770. data/db/migrate/20101026184714_migrate_transactions_to_payment_state.rb +0 -98
  771. data/db/migrate/20101026184746_delete_in_progress_orders.rb +0 -19
  772. data/db/migrate/20101026184808_migrate_checkout_to_orders.rb +0 -23
  773. data/db/migrate/20101026184855_remove_shipped_state.rb +0 -12
  774. data/db/migrate/20101026184916_prevent_nil_payment_total.rb +0 -8
  775. data/db/migrate/20101026184932_prevent_nil_email.rb +0 -9
  776. data/db/migrate/20101026184959_generate_anonymous_users.rb +0 -20
  777. data/db/migrate/20101026185022_update_order_state.rb +0 -12
  778. data/db/migrate/20101026192225_cleanup_legacy_tables.rb +0 -11
  779. data/db/migrate/20101028151745_remove_number_and_cvv_from_credicard.rb +0 -11
  780. data/db/migrate/20101103212716_drop_anonymous_field_for_user.rb +0 -11
  781. data/db/migrate/20101111133551_renamed_rma_cancelled_state.rb +0 -9
  782. data/db/migrate/20101117031806_fix_problematic_index_names.rb +0 -13
  783. data/db/migrate/20101223215658_add_position_to_variants.rb +0 -5
  784. data/db/migrate/20110110130847_add_next_state_to_state_events.rb +0 -5
  785. data/db/migrate/20110111122537_add_position_to_option_types.rb +0 -5
  786. data/db/migrate/20110314192118_remove_trailing_slashes_in_taxon_permalinks.rb +0 -19
  787. data/db/migrate/20110329141434_create_activators.rb +0 -14
  788. data/db/migrate/20110418151136_eligible_for_adjustments.rb +0 -5
  789. data/db/migrate/20111007143030_namespace_top_level_models.rb +0 -66
  790. data/db/migrate/20111107143030_migrate_namespaced_polymorphic_models.rb +0 -52
  791. data/db/migrate/20111201024007_make_adjustments_polymorphic.rb +0 -9
  792. data/db/migrate/20111215032408_add_company_to_addresses.rb +0 -5
  793. data/db/migrate/20111216154844_add_inc_tax_to_tax_rates.rb +0 -5
  794. data/db/migrate/20111219203242_rename_inc_price_attribute.rb +0 -5
  795. data/db/migrate/20111219205902_add_default_tax_zone.rb +0 -5
  796. data/db/migrate/20120105193911_associate_shipping_methods_and_shipping_categories.rb +0 -7
  797. data/db/migrate/20120105195817_add_match_rules_to_shipping_methods.rb +0 -7
  798. data/db/migrate/20120119024710_new_preferences.rb +0 -48
  799. data/db/migrate/20120203001428_rename_state_events_to_state_changes.rb +0 -9
  800. data/db/migrate/20120203153759_add_deleted_at_to_tax_category.rb +0 -5
  801. data/db/migrate/20120315064358_migrate_images_from_products_to_variants.rb +0 -37
  802. data/db/migrate/20120416233427_rename_attachment_size_to_attachment_file_size.rb +0 -5
  803. data/db/migrate/20120507232704_increase_scale_of_tax_rate_amount.rb +0 -9
  804. data/db/migrate/20120509055454_create_tokenized_permissions_table.rb +0 -16
  805. data/db/migrate/20120523061241_convert_sales_tax_to_default_tax.rb +0 -9
  806. data/db/migrate/20120530012000_rename_creditcards_to_credit_cards.rb +0 -11
  807. data/db/migrate/20120604030249_add_deleted_at_to_spree_shipping_methods.rb +0 -5
  808. data/db/migrate/20120604203654_remove_credit_total_from_orders.rb +0 -5
  809. data/db/migrate/20120712172620_add_counter_cache_to_zone_members.rb +0 -14
  810. data/db/migrate/20130203232234_add_identifier_to_spree_payments.rb +0 -5
  811. data/db/migrate/20130222032153_add_order_id_index_to_shipments.rb +0 -5
  812. data/lib/spree/core/authorize_net_cim_hack.rb +0 -871
  813. data/lib/spree/core/controller_helpers.rb +0 -185
  814. data/lib/spree/core/current_order.rb +0 -38
  815. data/lib/spree/core/file_utilz.rb +0 -74
  816. data/lib/tasks/assets.rake +0 -58
  817. data/vendor/assets/stylesheets/html5reset.css +0 -177
@@ -0,0 +1,7 @@
1
+ /*---------------------------------------------------------
2
+ Empty file to override variables in user applications.
3
+
4
+ To set your own colors, sizes or fonts just override this
5
+ file in you're application and set valiables according to
6
+ globals/_variables.scss file.
7
+ --------------------------------------------------------- */
@@ -0,0 +1,73 @@
1
+ // IE general hacks
2
+ html.ie {
3
+
4
+ // Properly align icons in circle
5
+ table td.actions .no-text.icon-edit {
6
+ padding-top: 3px !important;
7
+ }
8
+ table td.actions .no-text.icon-envelope-alt {
9
+ padding-top: 4px !important;
10
+ }
11
+
12
+ // Fix select2 background gradient. (It uses filter gradients for IE)
13
+ .select2-choice, .select2-choice div,
14
+ .select2-container-multi .select2-search-choice,
15
+ .select2-container:hover .select2-choice,
16
+ .select2-container.select2-container-active .select2-choice {
17
+ filter: none;
18
+ }
19
+ .select2-search {
20
+ &:before {
21
+ position: relative;
22
+ z-index: 10000;
23
+ content: '\f002' !important;
24
+ }
25
+ input {
26
+ position: relative;
27
+ z-index: 0;
28
+ }
29
+ }
30
+
31
+ // Fix margin-top for destroy paperclip styles background
32
+ .destroy_new_attachment_styles {
33
+ margin-top: 17px !important;
34
+ }
35
+ }
36
+
37
+ // IE8 Hacks
38
+ html.ie8 {
39
+
40
+ // Fix italic font
41
+ body {
42
+ font-style: normal;
43
+ }
44
+
45
+ // Fix white border around filter-actions
46
+ .filter-actions {
47
+ margin-bottom: -45px;
48
+
49
+ button, .button, input[type="submit"], input[type="button"], span.or {
50
+ border: 15px solid $color-1;
51
+ }
52
+ span.or {
53
+ border-width: 5px;
54
+ margin-left: -10px;
55
+ margin-right: -10px;
56
+ }
57
+ }
58
+
59
+ // Fix legend align center
60
+ legend {
61
+ display: table;
62
+ }
63
+
64
+ // Sidebar align with fieldsets
65
+ #sidebar {
66
+ margin-top: 27px;
67
+
68
+ .sidebar-title span {
69
+ margin-left: 7px;
70
+ }
71
+ }
72
+
73
+ }
@@ -0,0 +1,32 @@
1
+ html.firefox {
2
+
3
+ // Fix sidebar margin
4
+ #sidebar {
5
+ margin-top: 18px;
6
+ }
7
+
8
+ // Properly align icons in circle
9
+ table td.actions .no-text.icon-edit {
10
+ padding-left: 1px;
11
+ }
12
+
13
+ // Fix select2 tag input size
14
+ input.select2-input {
15
+ padding: 0px 10px !important;
16
+ }
17
+
18
+ // Fix select2 tag input container padding
19
+ .select2-container-multi .select2-choices {
20
+ padding-bottom: 0 !important;
21
+ }
22
+
23
+ // Fix select2 search input left padding to not overlap search icon
24
+ .select2-search input.select2-input {
25
+ padding-left: 25px !important;
26
+ }
27
+
28
+ // Fix image file upload width
29
+ input#image_attachment {
30
+ width: 80%;
31
+ }
32
+ }
@@ -0,0 +1,17 @@
1
+ html.opera {
2
+
3
+ // Fix legend center align
4
+ legend {
5
+ margin: 0 auto;
6
+ }
7
+
8
+ // Properly align icons in circle
9
+ table td.actions .no-text.icon-edit {
10
+ padding-left: 1px;
11
+ }
12
+
13
+ // Fix sidebar margin
14
+ #sidebar {
15
+ margin-top: 18px;
16
+ }
17
+ }
@@ -0,0 +1,132 @@
1
+ #taxonomy_tree {
2
+ > ul, .jstree-icon {
3
+ background-image: none;
4
+ }
5
+
6
+ .jstree-icon {
7
+ @extend [class^="icon-"]:before;
8
+ }
9
+
10
+ .jstree-open > .jstree-icon {
11
+ @extend .icon-caret-down;
12
+ }
13
+ .jstree-closed > .jstree-icon {
14
+ @extend .icon-caret-right;
15
+ }
16
+
17
+ li {
18
+ background-image: none;
19
+
20
+ a {
21
+ background-color: very-light($color-3);
22
+ border: 1px solid $color-border;
23
+ color: $color-body-text;
24
+ font-weight: $font-weight-bold;
25
+ text-shadow: none;
26
+ width: 90%;
27
+ height: auto;
28
+ line-height: inherit;
29
+ text-transform: uppercase;
30
+ padding: 5px 0 5px 10px;
31
+ margin-bottom: 10px;
32
+
33
+ .jstree-icon {
34
+ padding-left: 0px;
35
+ @extend .icon-move;
36
+ }
37
+ }
38
+ }
39
+ }
40
+
41
+ #vakata-dragged.jstree-apple .jstree-invalid,
42
+ #vakata-dragged.jstree-apple .jstree-ok,
43
+ #jstree-marker {
44
+ background-image: none !important;
45
+ background-color: transparent !important;
46
+ @extend [class^="icon-"]:before;
47
+ }
48
+ #vakata-dragged.jstree-apple .jstree-invalid {
49
+ @extend .icon-remove;
50
+ color: $color-5;
51
+ }
52
+ #vakata-dragged.jstree-apple .jstree-ok {
53
+ @extend .icon-ok;
54
+ color: $color-2;
55
+ }
56
+
57
+ #jstree-marker {
58
+ @extend .icon-caret-right;
59
+ color: $color-body-text !important;
60
+ width: 4px !important;
61
+ }
62
+
63
+ #jstree-marker-line {
64
+ @include border-radius($border-radius !important);
65
+ height: 0px !important;
66
+ margin-left: 5px !important;
67
+ margin-top: -2px !important;
68
+ border: none !important;
69
+ border-bottom: 1px solid $color-body-text !important;
70
+ background-color: very-light($color-3) !important;
71
+
72
+ -webkit-box-shadow: none !important;
73
+ -moz-box-shadow: none !important;
74
+ box-shadow: none !important;
75
+
76
+ }
77
+
78
+ #vakata-contextmenu {
79
+ background-color: $color-3 !important;
80
+ -moz-box-shadow: none !important;
81
+ -webkit-box-shadow: none !important;
82
+ box-shadow: none !important;
83
+ border: none !important;
84
+ @include border-radius($border-radius !important);
85
+
86
+ &:before {
87
+ content: '';
88
+ position: absolute;
89
+ border-left: 10px solid transparent;
90
+ border-right: 10px solid transparent;
91
+ border-bottom: 10px solid $color-3;
92
+ top: 0px;
93
+ margin-top: -10px;
94
+ left: 25px;
95
+ z-index: 1;
96
+ }
97
+
98
+ a {
99
+ color: $color-1 !important;
100
+ line-height: inherit !important;
101
+ padding: 5px 10px !important;
102
+ margin: 0 !important;
103
+ font-size: 90% !important;
104
+
105
+ &:hover {
106
+ @include border-radius($border-radius !important);
107
+ background-color: $color-2 !important;
108
+ border: none !important;
109
+ -moz-box-shadow: none !important;
110
+ -webkit-box-shadow: none !important;
111
+ line-height: inherit !important;
112
+ padding: 5px 10px !important;
113
+ margin: 0 !important;
114
+ }
115
+ }
116
+
117
+ li:first-child a:hover:before {
118
+ content: '';
119
+ position: absolute;
120
+ border-left: 10px solid transparent;
121
+ border-right: 10px solid transparent;
122
+ border-bottom: 10px solid $color-2;
123
+ top: 0px;
124
+ margin-top: -10px;
125
+ left: 25px;
126
+ z-index: 1;
127
+ }
128
+
129
+ li.vakata-separator {
130
+ display: none;
131
+ }
132
+ }
@@ -0,0 +1,86 @@
1
+ #powerTip {
2
+ background-color: $color-3;
3
+ padding: 5px 15px;
4
+ @include border-radius($border-radius);
5
+
6
+ &.n:before, &.ne:before, &.nw:before {
7
+ border-top-width: 5px;
8
+ border-top-color: $color-3;
9
+ bottom: -5px;
10
+ }
11
+
12
+ &.e:before {
13
+ border-right-width: 5px;
14
+ border-right-color: $color-3;
15
+ left: -5px;
16
+ }
17
+ &.s:before, &.se:before, &.sw:before {
18
+ border-bottom-width: 5px;
19
+ border-bottom-color: $color-3;
20
+ top: -5px;
21
+ }
22
+ &.w:before {
23
+ border-left-width: 5px;
24
+ border-left-color: $color-3;
25
+ right: -5px;
26
+ }
27
+ &.ne:before, &.se:before {
28
+ border-right-width: 5px;
29
+ border-right-color: $color-3;
30
+ left: -5px;
31
+ }
32
+ &.nw:before, &.sw:before {
33
+ border-left-width: 5px;
34
+ border-right-color: $color-3;
35
+ right: -5px;
36
+ }
37
+
38
+ &.clone, &.yellow {
39
+ background-color: $color-notice;
40
+
41
+ &.n:before, &.ne:before, &.nw:before {
42
+ border-top-color: $color-notice;
43
+ }
44
+ &.e:before, &.nw:before, &.sw:before {
45
+ border-right-color: $color-notice;
46
+ }
47
+ &.s:before, &.se:before, &.sw:before {
48
+ border-bottom-color: $color-notice;
49
+ }
50
+ &.w:before {
51
+ border-left-color: $color-notice;
52
+ }
53
+ }
54
+ &.edit, &.green, &.capture {
55
+ background-color: $color-success;
56
+
57
+ &.n:before, &.ne:before, &.nw:before {
58
+ border-top-color: $color-success;
59
+ }
60
+ &.e:before, &.nw:before, &.sw:before {
61
+ border-right-color: $color-success;
62
+ }
63
+ &.s:before, &.se:before, &.sw:before {
64
+ border-bottom-color: $color-success;
65
+ }
66
+ &.w:before {
67
+ border-left-color: $color-success;
68
+ }
69
+ }
70
+ &.remove, &.red, &.void {
71
+ background-color: $color-error;
72
+
73
+ &.n:before, &.ne:before, &.nw:before {
74
+ border-top-color: $color-error;
75
+ }
76
+ &.e:before, &.nw:before, &.sw:before {
77
+ border-right-color: $color-error;
78
+ }
79
+ &.s:before, &.se:before, &.sw:before {
80
+ border-bottom-color: $color-error;
81
+ }
82
+ &.w:before {
83
+ border-left-color: $color-error;
84
+ }
85
+ }
86
+ }
@@ -0,0 +1,176 @@
1
+ .select2-container {
2
+ &:hover .select2-choice, &.select2-container-active .select2-choice {
3
+ background-color: $color-sel-hover-bg !important;
4
+ border-color: $color-sel-hover-bg !important;
5
+ }
6
+ .select2-choice {
7
+ background-image: none !important;
8
+ background-color: $color-sel-bg;
9
+ border: none !important;
10
+ box-shadow: none !important;
11
+ @include border-radius($border-radius);
12
+ color: $color-1 !important;
13
+ font-size: 90%;
14
+ height: 31px;
15
+ line-height: inherit !important;
16
+ padding: 5px 15px 7px;
17
+
18
+ span {
19
+ display: block;
20
+ padding: 2px;
21
+ }
22
+
23
+ .select2-search-choice-close {
24
+ background-image: none !important;
25
+ font-size: 100% !important;
26
+ @extend .icon-remove;
27
+ @extend [class^="icon-"]:before;
28
+ margin-top: 2px;
29
+ }
30
+
31
+ div {
32
+ background-image: none !important;
33
+ background-color: transparent !important;
34
+ border-radius: 0 !important;
35
+ border: none !important;
36
+
37
+ b {
38
+ background-image: none !important;
39
+ display: inherit !important;
40
+ width: auto !important;
41
+ height: auto !important;
42
+ margin-top: 10px;
43
+ @extend .icon-caret-down;
44
+ @extend [class^="icon-"]:before;
45
+ }
46
+ }
47
+ }
48
+
49
+ &.select2-container-active {
50
+ .select2-choice {
51
+ box-shadow: none !important;
52
+ }
53
+
54
+ &.select2-dropdown-open .select2-choice div b {
55
+ @extend .icon-caret-up
56
+ }
57
+ }
58
+ }
59
+
60
+ .select2-drop {
61
+ border-color: $color-sel-hover-bg;
62
+ box-shadow: none !important;
63
+ z-index: 1000000;
64
+
65
+ &.select2-drop-above {
66
+ border-color: $color-sel-hover-bg;
67
+ }
68
+ }
69
+
70
+ .select2-search {
71
+ @extend [class^="icon-"]:before;
72
+ @extend .icon-search;
73
+ font-size: 100%;
74
+ padding-left: 15px;
75
+ color: darken($color-border, 15);
76
+
77
+ input {
78
+ @extend input[type="text"];
79
+ margin-top: 5px;
80
+ margin-left: -23px;
81
+ padding-left: 25px;
82
+ padding-top: 6px;
83
+ padding-bottom: 6px;
84
+ font-family: $base-font-family;
85
+ font-size: 90%;
86
+ box-shadow: none;
87
+ background-image: none;
88
+ }
89
+ }
90
+
91
+ .select2-results {
92
+ padding-left: 0 !important;
93
+
94
+ li {
95
+ font-size: 85% !important;
96
+
97
+ &.select2-highlighted {
98
+ .select2-result-label {
99
+ &, h6 {
100
+ color: $color-1 !important;
101
+ }
102
+ }
103
+ }
104
+
105
+ .select2-result-label {
106
+ color: $color-body-text;
107
+ min-height: 22px;
108
+ clear: both;
109
+ overflow: auto;
110
+ }
111
+
112
+ &.select2-no-results, &.select2-searching {
113
+ padding: 5px;
114
+ background-color: transparent;
115
+ color: $color-body-text;
116
+ text-align: center;
117
+ font-weight: $font-weight-bold;
118
+ text-transform: uppercase;
119
+ }
120
+ }
121
+
122
+ .select2-highlighted {
123
+ background-color: $color-sel-bg;
124
+ }
125
+ }
126
+
127
+ .select2-container-multi {
128
+ &.select2-container-active, &.select2-dropdown-open {
129
+ .select2-choices {
130
+ border-color: $color-sel-hover-bg !important;
131
+ box-shadow: none;
132
+ border-bottom-left-radius: 0;
133
+ border-bottom-right-radius: 0;
134
+ }
135
+ }
136
+ .select2-choices {
137
+ @extend input[type="text"];
138
+ padding: 6px 3px 3px 3px;
139
+ box-shadow: none;
140
+ background-image: none;
141
+
142
+ .select2-search-choice {
143
+ @include border-radius($border-radius);
144
+ margin: 0 0 3px 3px;
145
+ background-image: none;
146
+ background-color: $color-sel-bg;
147
+ border: none;
148
+ box-shadow: none;
149
+ color: $color-1 !important;
150
+ font-size: 85%;
151
+
152
+ &:hover {
153
+ background-color: $color-sel-hover-bg;
154
+ }
155
+
156
+ .select2-search-choice-close {
157
+ background-image: none !important;
158
+ font-size: 85% !important;
159
+ @extend .icon-remove;
160
+ @extend [class^="icon-"]:before;
161
+ margin-left: 2px;
162
+ color: $color-1;
163
+ }
164
+ }
165
+ }
166
+ }
167
+
168
+ label .select2-container {
169
+ margin-top: -6px;
170
+ .select2-choice {
171
+ span {
172
+ text-transform: none;
173
+ font-weight: normal;
174
+ }
175
+ }
176
+ }