Commit Graph

3145 Commits

Author SHA1 Message Date
summerscope
b60c9daf21 Modal tweaks to make interior container scroll when too high 2014-07-29 12:57:22 +10:00
Will Marshall
f1c4ca98a1 Defaulting to OFN logo 2014-07-29 12:55:58 +10:00
Will Marshall
48b8c7e6c1 reverting our change back to position fixed 2014-07-29 12:51:51 +10:00
Will Marshall
2d40a8f023 Fixing links on modals 2014-07-29 12:20:06 +10:00
Will Marshall
c4f7c1af60 Lots of small bug fixes, changing image sizes 2014-07-29 11:33:25 +10:00
Will Marshall
39a79869c0 Disabling buttons and some work on the price breakdowns, including commenting them out for now 2014-07-29 11:33:25 +10:00
summerscope
4ab781d74a Update and tweak producers page background image 2014-07-29 10:53:34 +10:00
summerscope
3ebc2ba145 Fix checkout button layout in menu for firefox etc 2014-07-28 16:41:26 +10:00
summerscope
d6c9f41a00 Making the styling for headings on modals better 2014-07-28 16:14:44 +10:00
summerscope
3d472bc57e Make the header styles consistent for the modals 2014-07-28 16:14:01 +10:00
summerscope
cd27a2f3cb Update map icons to make them match new colors 2014-07-28 16:10:17 +10:00
summerscope
8f83853a5c Hub remove unnecessary style 2014-07-28 15:23:55 +10:00
summerscope
06cf8c1f0f A little bit more refactoring to make things scalable and cleaner 2014-07-28 15:04:07 +10:00
summerscope
9e4615f141 Refactoring css for active_table and hub producer children. Tighten and tidy css, make consistent for hubs and producers nodes across all responsive sizes. 2014-07-28 13:51:44 +10:00
summerscope
68aaf24f5c Remove active_table specific styles from this stuff 2014-07-28 13:51:44 +10:00
summerscope
7a62ae6637 Add style for turquoise text 2014-07-28 13:51:44 +10:00
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
2014-07-28 13:43:31 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +10:00
summerscope
d3cfceaf94 Producer tab on shopfront tweaks - add producer icon and better classes for responsive 2014-07-25 17:29:15 +10:00
summerscope
769a7d3b90 Add a center aligned class 2014-07-25 17:28:06 +10:00
summerscope
31b227892a Style updates for shopping cart rich pop-over 2014-07-25 16:41:32 +10:00
summerscope
dd984ac198 Hub node more responsive tweaks 2014-07-25 14:39:14 +10:00
summerscope
4ee5647dcc Design tweaks to homepage view 2014-07-25 14:38:56 +10:00
summerscope
e5a9a00378 Adding pretty macbook image behind Scuse us pane 2014-07-25 14:36:08 +10:00
summerscope
07432cebc3 Styling tweaks to hub nodes on homepage search for responsiveness. Makes the Hub name not flow over two lines ever. Cus no. 2014-07-25 13:16:01 +10:00
Rohan Mitchell
5c5e7e8ed3 Hide checkout paypal button, remove unneeded frontend JS 2014-07-25 12:44:14 +10:00
Rohan Mitchell
5980234be0 Install better_spree_paypal_express 2014-07-25 12:44:14 +10:00
summerscope
fb4a36c0ff Add new button style for use - turquoise for secondary CTA buttons 2014-07-24 17:45:04 +10:00
summerscope
561cd31864 Tweak color to reflect branding colors 2014-07-24 17:44:45 +10:00
summerscope
b57aaa8ec8 More styling tweaks and adjustments for responsive 2014-07-24 17:44:21 +10:00
summerscope
f71dee6b01 Remove border on filters to reflect change of button color 2014-07-24 17:43:57 +10:00
summerscope
76ed0cc976 Add some spacing on Checkout now button for small screens so the buttons dont fight 2014-07-24 17:43:34 +10:00
summerscope
79b9db5d52 Producer styles tweak with changes to active table 2014-07-24 17:42:23 +10:00
summerscope
9babd04472 Tweak turquoise secondary colors 2014-07-24 17:42:04 +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
Will Marshall
2120ab96ca Fixing bugs and spec regressions 2014-07-24 16:02:10 +10:00
Rohan Mitchell
d1b2f01578 Add special instructions to checkout 2014-07-24 15:13:23 +10:00
Will Marshall
f45dd24803 Patched up popovers for our nefarious purposes + cart pretties 2014-07-24 14:56:13 +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
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
508149fbca Adding shipping methods angularisation to enterprise edit view 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