26 Commits

Author	SHA1	Message	Date
Will Marshall	74b9810d22	Removing image from about us	2014-06-06 14:04:47 +10:00
Will Marshall	fc02e7857a	Merge branch 'master' into laura_and_will ... Conflicts: app/views/shopping_shared/_contact.html.haml	2014-06-04 17:24:30 +10:00
Will Marshall	874afb2d7e	Hiding image if not present	2014-06-04 17:13:18 +10:00
Will Marshall	5bd7485ca6	Restoring the image	2014-06-04 17:13:18 +10:00
Will Marshall	2c43d5960d	Patching up url formatting, still need to normalize this on backend	2014-06-04 17:12:17 +10:00
summerscope	62e8a913fa	Merge branch 'laura_and_will' into icon_font	2014-06-04 11:09:37 +10:00
summerscope	1a39b70a14	Merge branch 'master' into laura_and_will	2014-06-04 11:08:44 +10:00
summerscope	037769bfb1	Adding new icons from icon font	2014-06-03 11:50:17 +10:00
summerscope	8fa053a0a8	Commenting out promo image from About tab in shopfront page. This needs an additional image style to be applied before it can be implemented correctly.	2014-06-03 10:28:18 +10:00
summerscope	31ae0cf2a9	Tweak logic on contact us address line display	2014-05-30 16:14:40 +10:00
Will Marshall	5f163eef1c	Tweaking the contact thingy	2014-05-30 16:10:45 +10:00
summerscope	ae310ff606	Refactor producers tab content for spacing of string	2014-05-30 16:02:46 +10:00
summerscope	587cf1ac9b	Tabs styling for hub shopfront page	2014-05-30 15:56:40 +10:00
summerscope	06adca7462	Producers tab content styling and layout for hub shopfront page	2014-05-30 15:54:42 +10:00
summerscope	9f172af34c	Styling and layout for groups tab content	2014-05-30 15:54:42 +10:00
summerscope	87d58b639d	Styling and layout and content updates to contact hub tab content	2014-05-30 15:54:42 +10:00
summerscope	57b895b0c3	Styling and layout for About Hub Name tab content on shopping page	2014-05-30 15:54:41 +10:00
Will Marshall	be640fd856	Patching a spec and naming something	2014-05-30 15:02:47 +10:00
Will Marshall	ee785a3498	Merge branch 'master' into laura_and_will	2014-05-30 12:01:33 +10:00
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	d5a652182e	Scrolling to groups when hotlinked	2014-05-29 16:31:12 +10:00
Will Marshall	c49d9d838c	Removing reference to modals and unnecessary ID	2014-05-29 16:19:20 +10:00
Will Marshall	f28fe34958	Removing groups modals	2014-05-29 16:15:39 +10:00
Will Marshall	e44853346e	Dropping current producers, switching to suppliers and using Angular	2014-05-29 16:12:58 +10:00
Rohan Mitchell	fdff442ec6	Do not fetch products JSON on every shopping page	2014-05-29 10:54:08 +10:00
Will Marshall	b907616749	Renaming our partials	2014-05-02 14:47:12 +10:00