7241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Rohan Mitchell	5a43c80231	Convert tabs to spaces	2015-05-12 12:26:35 +10:00
Rohan Mitchell	4e0478bbe9	Update copy and spacing on hubs page	2015-05-12 11:59:51 +10:00
Rohan Mitchell	d261ea617a	A little more space between header and button	2015-05-12 11:50:40 +10:00
Rohan Mitchell	f416503bde	Tighten up footer lock	2015-05-12 11:49:45 +10:00
Rohan Mitchell	0184925ac8	Switch out footer logo for logo with no text	2015-05-12 11:41:49 +10:00
Rohan Mitchell	ebc452b1e2	Style home page stats pane	2015-05-12 11:33:07 +10:00
Rohan Mitchell	7b36f9dbf8	Add friendly icons for home systems pane	2015-05-12 10:45:42 +10:00
Rohan Mitchell	b2f687cd11	Style home panes (all except stats)	2015-05-12 10:21:52 +10:00
Rohan Mitchell	5a63353004	Extract transparent button style, use on home tagline and CTA2	2015-05-12 10:14:47 +10:00
Rohan Mitchell	7c37b4783a	Avoid adding top padding on mobile menu	2015-05-12 10:10:52 +10:00
Rohan Mitchell	8178076dd2	Use more subtle background for tile image	2015-05-12 10:09:14 +10:00
Rohan Mitchell	25aede1bdf	Brighten landscape home hero image	2015-05-12 10:08:39 +10:00
Rick Giner	e801d6199a	Passing in $event in other views that call toggle()	2015-05-11 20:33:35 +10:00
Rick Giner	62ae38372e	#541 add "show more" link to producers lists in hub on home page	2015-05-11 20:31:24 +10:00
Paul Mackay	955f41633a	Merge remote-tracking branch 'refs/remotes/origin/master' into producer-emails	2015-05-11 08:36:09 +01:00
Rohan Mitchell	b2d8d9fdfd	Make nav menu centered, logo a little larger	2015-05-11 17:32:02 +10:00
Rohan Mitchell	fec375fbea	Decrease padding on brand story	2015-05-11 16:52:39 +10:00
Rohan Mitchell	5498d03660	Add zoomed-in tile	2015-05-11 16:52:01 +10:00
Rohan Mitchell	82334036d1	Orange-styled tile	2015-05-11 16:43:53 +10:00
Rohan Mitchell	fa6b0fac3f	Add landscape hero image	2015-05-11 16:36:26 +10:00
Rohan Mitchell	f99333dbd5	Remove trailing whitespace	2015-05-11 16:35:50 +10:00
Rohan Mitchell	9ee6ef06da	Return logo to smaller size ... This reverts commit 460d0c9907.	2015-05-11 16:14:30 +10:00
Rohan Mitchell	460d0c9907	Increase size of logo to fill page above the fold. Remove cta1 pane.	2015-05-11 15:53:46 +10:00
Rohan Mitchell	14afe932c1	Resize menu logo, make it always fully opaque	2015-05-11 14:39:53 +10:00
Rohan Mitchell	978c176cf6	Remove filter on hero image, set up superimposed logo and shop now CTA	2015-05-11 14:37:28 +10:00
Rohan Mitchell	3e82deb1f5	Add new home hero images	2015-05-11 14:32:07 +10:00
Rick Giner	b7c1a43125	Issue #540 Fix up hub list navigation	2015-05-10 18:13:30 +10:00
Rick Giner	98c1a95bd1	Issue #531 remove Google map road markers	2015-05-10 16:51:56 +10:00
Rick Giner	9c3ec950fc	Revert "ginerr_#531_remove Google map road markers" ... This reverts commit 3e2117134f.	2015-05-10 16:50:58 +10:00
Rick Giner	3e2117134f	ginerr_#531_remove Google map road markers	2015-05-10 16:50:00 +10:00
Lynne	90dd1ea4a2	Merge pull request #1 from openfoodfoundation/variable_weights ... Merging	2015-05-09 19:25:30 +01:00
Lynne Davis	26ee5c49b2	Fixing merge conflicts	2015-05-09 19:14:50 +01:00
Lynne Davis	3179887842	Do not allow line_item.unit_value to be updated if the variant.unit_value is zero	2015-05-09 19:12:24 +01:00
Lynne Davis	4d025ee7a9	Updating the spec based on @Robs suggestions, hoping for his insights. Still doesn't work.	2015-05-09 19:10:55 +01:00
Lynne Davis	521834bd76	Populate the line item unit value, when line_item created and update old data in migration	2015-05-09 19:10:55 +01:00
Lynne Davis	662c7fe368	Removing notes to myself from this file	2015-05-09 19:10:55 +01:00
Lynne Davis	54da7ae241	Adding additional logic for if the line_item unit_value is nil	2015-05-09 19:10:55 +01:00
Lynne Davis	2a991ad130	Variable Weights: Adding ability to update the weight/volume of a line_item after checkout. The price of the line_item is automatically updated to reflect the value of the new weight.	2015-05-09 19:10:55 +01:00
Lynne Davis	2f463474fb	Adding specs for variable weight adjustment via builk order management	2015-05-09 19:10:55 +01:00
Lynne Davis	f7ade48e86	Update DB schema to store updatable weight on items sold	2015-05-09 19:10:55 +01:00
Paul Mackay	fd37324359	#536: Add permissions checking for Notify producers action.	2015-05-09 11:02:25 +01:00
Continuous Integration	3d0880857a	Auto-merge from CI [skip ci]	2015-05-08 16:24:39 +10:00
Rohan Mitchell	8cb8aacefe	Switch logo for white menu	2015-05-08 16:07:59 +10:00
Rohan Mitchell	6fc9789477	Invert colours on top menu	2015-05-08 15:11:54 +10:00
Rohan Mitchell	6322fdc1f0	Disable top alert	2015-05-08 15:03:37 +10:00
Continuous Integration	df14c10608	Auto-merge from CI [skip ci]	2015-05-08 13:45:56 +10:00
Rohan Mitchell	1531c476e3	Merge branch 'master' into require_standard_variant ... Conflicts: spec/controllers/spree/admin/variants_controller_spec.rb	2015-05-08 13:45:31 +10:00
Rohan Mitchell	e8c8d8885c	Merge branch 'master' into single-order-patches	2015-05-08 12:42:56 +10:00
Rohan Mitchell	768c9f24a2	Make topbar height configurable	2015-05-08 11:22:55 +10:00
Rohan Mitchell	a450d3af81	Variables can now be used to override foundation vars	2015-05-08 11:15:27 +10:00