raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-25 05:45:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,628 Commits 15 Branches 458 Tags
1d5cc5dcedc39efe0fe13fea67ca90b30f61e5aa
Commit Graph

266 Commits

Author SHA1 Message Date
summerscope
c0cb9857cc Style and template adjustments to shopfront top of page to get content hierarchy looking right. Removed change location link as new menu system supercedes this. 2014-05-29 16:42:05 +10:00
Will Marshall
74211cbfc7 Merge branch 'master' into fixing_modals 
Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl
 2014-05-29 11:14:16 +10:00
summerscope
1a79b966e9 Adding in links to homepage buttons for Groups & Producers 2014-05-28 12:21:25 +10:00
summerscope
3c3409bc1f Tweaks to styling on groups page 2014-05-27 18:03:12 +10:00
summerscope
9fe4bef7df Adding groups icon into background for visual consistency 2014-05-27 17:55:51 +10:00
summerscope
2130470eaf Styling for groups page 2014-05-27 17:11:42 +10:00
Rohan Mitchell
e951f80070 Merge branch 'new-product-form' 
Conflicts:
	app/assets/javascripts/admin/admin.js.coffee
 2014-05-24 17:14:32 +10:00
Rohan Mitchell
69e0e71eb6 Revert "Styling for shop page product modal" 
This reverts commit 84b6f99321.

Conflicts:

	app/assets/stylesheets/darkswarm/images.css.sass
	app/views/modals/_producer.html.haml
 2014-05-24 09:12:24 +10:00
summerscope
4657285769 Producers modal styling and markup 2014-05-22 16:35:48 +10:00
Rob H
47f6d32055 Make list items the same height 2014-05-22 15:47:50 +10:00
Rob H
ed3c23cd90 Split 'My Enterprises' dashboard item into Hubs and Producers 2014-05-22 15:28:25 +10:00
summerscope
d7bc1a9b95 Styling for shop page product modal 2014-05-22 14:40:35 +10:00
Will Marshall
250b76ec79 Merge branch 'master' into new_shop 2014-05-22 10:43:02 +10:00
Rohan Mitchell
0c647841a6 Add dynamic filter to enterprise relationships 2014-05-21 16:18:07 +10:00
Rohan Mitchell
aa965e3752 Show a CSS3 animation when a row is added 2014-05-21 11:29:11 +10:00
summerscope
d874855aa1 Update styling on empty cart 2014-05-20 16:40:23 +10:00
summerscope
0957edee5d Styling for shopping cart page 2014-05-20 15:50:03 +10:00
summerscope
52345d9bb3 Improvements to shoptfront page styling 2014-05-20 14:11:41 +10:00
summerscope
1dd9f6326b Tweaking the markup and styling for shop page. 2014-05-16 15:59:53 +10:00
Will Marshall
eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura 2014-05-16 14:00:33 +10:00
Rob H
6979644af7 Fiddle with colors and scrolling in admin enterpise sidebar 2014-05-16 11:28:02 +10:00
Will Marshall
12ddbb6a32 Reworking the shop page 2014-05-16 10:23:31 +10:00
Rob H
19aa79fc27 Add max height to admin sidebar items 2014-05-16 10:06:20 +10:00
Rob H
fd6f4d04df Merge branch 'master' into ent-makeover 2014-05-15 17:05:05 +10:00
Rob H
7cdfb4bab2 Add methods and fees to sidebar on enterprise edit page 2014-05-15 14:52:19 +10:00
summerscope
ffd7f3c134 Refactor Friday! Tidying up css, removing unused lines, adding comments and general good stuff. 2014-05-14 15:55:19 +10:00
summerscope
dd89dad5b6 Add new font into buttons 2014-05-14 15:55:19 +10:00
summerscope
d462f34e75 Refactor friday - tidying up and commenting css 2014-05-14 15:55:18 +10:00
Rob H
31334be615 Tidy up of new dashboard, add 'CREATE NEW' button at top right 2014-05-14 11:31:42 +10:00
Rob H
c98d2e71d8 Add scroll pane to admin dashboard 2014-05-09 17:20:53 +10:00
Rob H
05e01d02c4 Merge branch 'master' into ent-makeover 2014-05-09 15:58:17 +10:00
Rob H
01c5822fcc Add basic dashboard to admin section 2014-05-09 15:48:58 +10:00
summerscope
7e96181f07 Add style classification to distinguish between pane and full page for #id 2014-05-09 14:54:47 +10:00
summerscope
3d2d6fa33c Styling for checkout page and the hubs heading above shopping section 2014-05-09 14:34:42 +10:00
summerscope
e8a5a4984b Styling work on the checkout page WIP 2014-05-09 14:34:42 +10:00
summerscope
961a32816c Remove variables sass - double up of branding 2014-05-09 14:34:42 +10:00
summerscope
eff4c5f309 Make small size generic not specific to footer 2014-05-09 14:34:42 +10:00
Will Marshall
0df2eabf95 Moving useless assets 2014-05-09 10:32:39 +10:00
Will Marshall
1e6783148d Merging 2014-05-09 10:16:26 +10:00
Will Marshall
d9f462ba81 Moving useless assets 2014-05-09 10:12:40 +10:00
summerscope
d227fb24fe Styling checkout page 2014-05-08 17:36:17 +10:00
summerscope
3a04ccb52c Menu styling for mobile menu 2014-05-08 17:10:29 +10:00
summerscope
07e53b8292 Make padding top responsive depending on big or mobile menu top-bar 2014-05-08 17:10:29 +10:00
summerscope
07f1bba822 Restyling active nodes for producer and hub 2014-05-08 17:10:28 +10:00
summerscope
c66aaad62e Styling for producers page and content in active table 2014-05-08 17:10:28 +10:00
summerscope
64c94793e4 Menu styling for mobile menu 2014-05-08 16:41:18 +10:00
summerscope
f2be0746bf Make padding top responsive depending on big or mobile menu top-bar 2014-05-08 16:01:34 +10:00
summerscope
daaa2760a0 Restyling active nodes for producer and hub 2014-05-08 15:55:36 +10:00
summerscope
e7a3b48274 Styling for producers page and content in active table 2014-05-08 15:34:43 +10:00
Will Marshall
50f5a1c46f Hash toggling 2014-05-08 13:19:44 +10:00