1928 Commits

Author	SHA1	Message	Date
summerscope	fc4e20ffd4	Adding new icons from new pretty icon font	2014-06-03 11:50:38 +10:00
summerscope	037769bfb1	Adding new icons from icon font	2014-06-03 11:50:17 +10:00
summerscope	a6a86612c7	Adding X from new icon font to modal	2014-06-03 11:48:11 +10:00
summerscope	31bab3469e	Implementing new X icon for modal window	2014-06-03 11:20:15 +10:00
summerscope	653120888f	Implementing new X icon for modal window	2014-06-03 11:20:03 +10:00
summerscope	c07ca67f29	Implementing new X icon for modal window	2014-06-03 11:19:56 +10:00
summerscope	73a68799be	Implementing new X icon for modal window	2014-06-03 11:19:45 +10:00
summerscope	d160f4fe51	Implementing new X icon for modal window	2014-06-03 11:19:37 +10:00
summerscope	cd332c1eb1	Implementing new X icon for modal window	2014-06-03 11:19:22 +10:00
summerscope	8a34160713	No change	2014-06-03 11:18:43 +10:00
summerscope	8caccfc5b0	Merge laura_and_will into icon_font	2014-05-30 17:01:49 +10:00
summerscope	ef5b36cddd	Styling producers	2014-05-30 16:39:07 +10:00
summerscope	b19ca3b9c4	Remove whitespace	2014-05-30 16:38:27 +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	5c46057bf3	Merge branch 'master' into laura_and_will	2014-05-30 15:53:03 +10:00
Will Marshall	13c6ce6786	Starting a basic implementation of the Cart/CurrentOrder so we know whether it's empty	2014-05-30 15:52:20 +10:00
Will Marshall	7abfb2f936	Showing the resizing logo as well	2014-05-30 15:32:47 +10:00
Will Marshall	3ddd7c31e8	Patching which image is rendered	2014-05-30 15:08:16 +10:00
Will Marshall	be640fd856	Patching a spec and naming something	2014-05-30 15:02:47 +10:00
Will Marshall	7304e24591	Switching the image dimensions	2014-05-30 14:47:53 +10:00
summerscope	5cbc60e686	Typo fix on food hub modal	2014-05-30 14:43:31 +10:00
summerscope	68582514ef	Grammar fix up for food hub modal	2014-05-30 14:41:34 +10:00
Will Marshall	a979334f2a	Adding primary taxon	2014-05-30 14:31:36 +10:00
Will Marshall	b736145552	Adding primary taxon to admin forms ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb spec/features/admin/products_spec.rb	2014-05-30 14:31:27 +10:00
Will Marshall	1c31ac56ea	Adding primary taxon field to product ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb	2014-05-30 14:31:03 +10:00
summerscope	72c50486fa	ADding new icons into producer modal	2014-05-30 14:29:08 +10:00
summerscope	91224ed0a4	Merge issues. Removing position fixed on modal window styling.	2014-05-30 14:27:37 +10:00
summerscope	5f6b8c9b5b	Merge branch 'laura_and_will' into icon_font	2014-05-30 13:19:54 +10:00
summerscope	5bdb38e293	Merge issues. Removing position fixed on modal window styling.	2014-05-30 13:19:47 +10:00
Will Marshall	85ee33517a	Restoring another deleted file	2014-05-30 13:19:23 +10:00
summerscope	42a9f16800	Adding in new icon into producer partial	2014-05-30 13:08:18 +10:00
summerscope	49a39bb240	Adding unlock icon to signed in	2014-05-30 13:06:48 +10:00
summerscope	179d9f609c	Adding in new lock icon to signed in	2014-05-30 13:05:56 +10:00
summerscope	2c334a0180	Styling for trash icon on checkout page	2014-05-30 13:02:34 +10:00
summerscope	00ac80bdbb	Add new icons	2014-05-30 12:56:56 +10:00
Will Marshall	368fbd2383	Patching up admin redirects to be MOAR UNIVERSAL	2014-05-30 12:52:14 +10:00
summerscope	a54b3f7849	Adding new icon for refresh	2014-05-30 12:39:44 +10:00
summerscope	9a962f7445	Add new icons to checkout & back to cart buttons	2014-05-30 12:35:54 +10:00
summerscope	5a7df20a2e	Update icon font for mixins	2014-05-30 12:32:46 +10:00
summerscope	589188d21e	Update icons for Tabs on hub shopping page	2014-05-30 12:32:28 +10:00
summerscope	5c44413ae9	Merge branch 'laura_and_will' into icon_font	2014-05-30 12:18:29 +10:00
summerscope	10418b6035	Merge issues. Removing position fixed on modal window styling.	2014-05-30 12:17:44 +10:00
summerscope	15cde6c372	Merge branch 'laura_and_will' into icon_font ... Conflicts: app/views/groups/index.html.haml app/views/modals/_producers.html.haml	2014-05-30 12:12:07 +10:00