raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-12 23:27:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 19 Branches 453 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

4200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
summerscope
c799d8b387 Make filter button turquoise 2014-07-24 17:41:48 +10:00
summerscope
01395f4eca Adjust active table styles to be a bit more generic 2014-07-24 16:33:05 +10:00
summerscope
94151a9152 Remove duplicated comments 2014-07-24 16:33:04 +10:00
summerscope
8bf3ad0bae Styling for new hub view on homepage in active_table 2014-07-24 16:33:03 +10:00
summerscope
b4db155612 Add taxon style for inactive row on active_table 2014-07-24 16:33:03 +10:00
summerscope
a3278209ac Tweak markup for active table Hubs 2014-07-24 16:33:03 +10:00
Will Marshall
bd662d4ec8 Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will 
Conflicts:
	app/views/shop/products/_master.html.haml
 2014-07-24 16:07:56 +10:00
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Rohan Mitchell
3dd7b296be Show order notes (special instructions) on report and confirmation email 2014-07-24 15:13:23 +10:00
Rohan Mitchell
d1b2f01578 Add special instructions to checkout 2014-07-24 15:13:23 +10:00
Rohan Mitchell
cecc0134f4 When mirroring a database, bring all payment methods into dev env 2014-07-24 15:13:22 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +10:00
Rob H
3d57e0a7a7 Add 'new' buttons to shipping and payment method edit pages 2014-07-24 13:46:35 +10:00
Rob H
177472dad9 Add asterix to product category on new product form 2014-07-24 12:58:42 +10:00
Rob H
fa48fa24b5 Restricting links in hubs sidebar to left hand side of row 2014-07-24 11:41:47 +10:00
Rob H
85cce0783e Fix styling for enteprise fees list 2014-07-24 11:34:38 +10:00
Rob H
2e5652472c Restricting links in enterprise page sidebars to left hand side of row 2014-07-24 11:29:55 +10:00
Will Marshall
63807fd2cd Fixing case when order doesn't axshully exist 2014-07-24 11:24:09 +10:00
Will Marshall
8ac0ee8f0e Fixing a missing scope on product.variants 2014-07-24 11:23:56 +10:00
Rob H
7fc80a0975 Fix failing enterprise spec 2014-07-24 11:05:14 +10:00
summerscope
6961a2ad00 Take the pop overs out of the tabindex 2014-07-24 10:58:08 +10:00
summerscope
2d25bd8a45 Adding checkout button back to the top as a stop gap measure 2014-07-24 10:57:37 +10:00
Will Marshall
d7ff1cd4af Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/checkout/_payment.html.haml
	app/views/checkout/_shipping.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-24 10:39:36 +10:00
Rob H
9055a441fd Removing trailing whitespace 2014-07-24 10:28:28 +10:00
Rob H
508149fbca Adding shipping methods angularisation to enterprise edit view 2014-07-24 10:16:55 +10:00
Rob H
9889b09c65 Add shipping method injection helper using id name serializer 2014-07-24 10:16:55 +10:00
Rob H
e8c7fe9db1 Rename payment method serializer as id name serializer 2014-07-24 10:16:55 +10:00
Rob H
37c16fb20c Add shipping method js infrastructure for angularising admin enterprises page 2014-07-24 10:16:54 +10:00
Rob H
6dbe2a3098 WIP: Angularise payment methods on enterprise edit page 2014-07-24 10:16:54 +10:00
Rob H
2200392031 Angularising Admin enterprises form 2014-07-24 10:16:54 +10:00
summerscope
a40b5689a9 Checkout page design tweaks and improvements to make accordion more usable 2014-07-23 16:57:38 +10:00
summerscope
fac7f9f818 Shopfront more styling and improvements for responsive. 2014-07-23 16:36:52 +10:00
summerscope
d6a4ae3cbf Will Marshall will you please read the comment here and help me with all the logix 2014-07-23 16:36:34 +10:00
Rob H
c4e50dbb13 Change error message for blank Product Category 2014-07-23 15:46:17 +10:00
summerscope
609326793a Styling for mobile menu line items 2014-07-23 15:36:15 +10:00
summerscope
7718cf0c48 Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things 2014-07-23 15:35:44 +10:00
summerscope
875f0f6780 Apply border radius against alllll the buttons 2014-07-23 15:15:48 +10:00
summerscope
47d84c25f6 Shopfront styling 2014-07-23 15:15:16 +10:00
summerscope
98e6c5e412 Markup tweaks to tweak inclusion of graph popover button 2014-07-23 15:15:03 +10:00
summerscope
f6c1ddc08a No change 2014-07-23 15:14:33 +10:00
summerscope
5b87a81460 Tweak bullet point list style content: to include right icon 2014-07-23 15:14:14 +10:00
summerscope
9f0457f355 Tweaking reds to make them a touch less berry 2014-07-23 15:13:47 +10:00
summerscope
9782d76f61 Tweak avenir in big input to avoid padding conflict 2014-07-23 15:13:29 +10:00
summerscope
7d5e7a9123 New popovers sass partial 2014-07-23 15:13:12 +10:00
summerscope
6dd5588ed5 Updating icon font to included some new required icons 2014-07-23 15:12:55 +10:00
Rob H
c8ddf86a9f Add failure block to create respond_override for creating products 2014-07-23 14:56:12 +10:00
summerscope
93f576e616 Turning of Maps, Groups, and Producers panes 2014-07-18 17:17:42 +10:00
summerscope
d86172d504 Adding rounded corners to alllllll the buttons 2014-07-18 17:17:18 +10:00
summerscope
56850d6d7d Design tweaks 2014-07-18 17:16:49 +10:00
summerscope
60a860b2ae New background image for entry point 2014-07-18 17:16:24 +10:00