Maikel Linke 2a3b3b6dd2 Merge remote-tracking branch 'origin/master' into i18n-hackathon ...

Conflicts:
	app/assets/javascripts/admin/enterprise_fees.js
	app/assets/javascripts/admin/enterprises/controllers/side_menu_controller.js.coffee
	app/views/admin/shared/_columns_dropdown.html.haml
	app/views/admin/variant_overrides/_header.html.haml
	app/views/admin/variant_overrides/_products.html.haml
	spec/features/admin/bulk_order_management_spec.rb
	spec/features/admin/variant_overrides_spec.rb

2016-03-11 15:38:28 +11:00

..

components

WIP: Splitting Variant overrides into views

2016-03-02 12:10:22 +11:00

account.css.scss

Styling tweaks to the admin account page

2015-09-17 22:38:11 +10:00

advanced_settings.css.scss

OC Coordinators can opt to restrict products in an order cycle to those in their inventory only

2016-03-02 12:10:22 +11:00

alert.css.sass

Fiddle with alert styling

2014-10-16 11:34:06 +11:00

all.css

Adding ngTagsInput to admin assets

2015-05-13 12:44:36 +10:00

animations.css.sass

Adding new save-bar directive for handling save actions for index pages

2015-11-06 09:53:31 +11:00

change_type_form.css.sass

Make margine appear for small devices only

2014-10-24 14:48:29 +11:00

dashboard_item.css.sass

Replace with-tip with ofn-with-tip: dashboard

2016-02-24 11:26:37 +11:00

dashboard-single-ent.css.sass

Dedicated new enterprise form

2014-12-19 14:05:24 +11:00

disabled.css.scss

Adding filters to variant overrides interface

2016-01-13 18:49:32 +11:00

dropdown.css.scss

WIP: Splitting Variant overrides into views

2016-03-02 12:10:22 +11:00

enterprise_console.css.scss

Adding a javascript interface for checking permalinks and user input on enterprise console

2015-01-22 10:19:43 +11:00

enterprise_index_panels.css.scss

Only serializing unresolved enterprise issues, styling tweaks and fixes for index

2015-06-12 15:49:01 +08:00

filters_and_controls.css.scss

Pulling columns dropdown out into a shared partial

2016-01-13 18:49:32 +11:00

icons.css.scss

Add refund icon

2015-04-30 15:49:48 +10:00

index_panels.css.scss

Fix styling issue for full sixteen column enterprise index panel

2015-06-15 16:10:33 +08:00

offsets.css.scss

WIP: Splitting Variant overrides into views

2016-03-02 12:10:22 +11:00

openfoodnetwork.css.scss

WIP: Adding Loading flash to variant overrides page

2016-03-02 12:10:22 +11:00

orders.css.scss

Remove   from locale en.yml

2016-03-11 14:45:43 +11:00

products.css.scss

Rename div update-status-message to status-message

2014-12-12 13:33:13 +11:00

relationships.css.sass

Style permission list items, order perms consistently by name

2014-08-25 15:05:49 +10:00

restore_spree_from_cms.css.scss

Ensure css is precompiled, reformat configs

2013-11-01 16:22:54 +11:00

select2.css.scss

Further styling for select2 after upgrade

2016-02-24 11:26:37 +11:00

side_menu.css.sass

Using pure css for styling odd and even menu items

2015-02-19 10:22:37 +11:00

sidebar-item.css.sass

move checks and links in sidebars

2014-09-26 17:58:00 +10:00

typography.css.scss

WIP: Alerting user to presence of new variant for inventory, new variants can be filtered + limited

2016-03-02 12:10:22 +11:00

validation.css.scss

Adding form validation to BOM

2015-10-28 13:07:32 +11:00

variant_overrides.css.sass

WIP: Splitting Variant overrides into views

2016-03-02 12:10:22 +11:00

welcome.css.sass

Remove unnecessary partial import

2014-10-30 11:30:21 +11:00