Commit Graph

1610 Commits

Author SHA1 Message Date
summerscope
c4cd15423c Add email link with reverse 2014-05-06 17:40:02 +10:00
summerscope
6cb186ffe3 Styling for footer and further work for top nav 2014-05-06 17:32:22 +10:00
summerscope
93f095d976 Adding a menu style and styling around the new top nav 2014-05-06 16:10:02 +10:00
Will Marshall
1a396429fe Re-ordering stuff for Laura 2014-05-06 12:27:21 +10:00
Will Marshall
5b962cc3e4 Merge branch 'darkswarm_home' 2014-05-06 11:41:37 +10:00
Will Marshall
25de2f920a Merge branch 'master' into reworking_menu
Conflicts:
	app/views/layouts/darkswarm.html.haml
2014-05-06 11:16:20 +10:00
Will Marshall
010025798d Removing a redundant 'in' 2014-05-05 16:29:33 +10:00
Will Marshall
9db602f031 Patching the visible flag in admin 2014-05-05 16:26:03 +10:00
Will Marshall
dcd2e39f2c Tweaking for a moved partial 2014-05-05 15:57:16 +10:00
Will Marshall
dd25bfd345 Starting to rework menu 2014-05-05 15:52:48 +10:00
Will Marshall
1774bc1e19 Adding producers filtering and more Angular magic 2014-05-05 15:43:11 +10:00
Will Marshall
bbb70342b3 Merging 2014-05-02 15:35:43 +10:00
Will Marshall
23fa1c7b7b Patching a couple more issues 2014-05-02 15:17:44 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Rohan Mitchell
4480c75494 Fix "undefined method 'association_class' for nil:NilClass" error when creating Migs payment gateway 2014-05-02 14:25:32 +10:00
Rohan Mitchell
c9aefa507a Remove chili 2014-05-02 14:25:32 +10:00
Will Marshall
3d06caf1e3 Merging in master 2014-05-02 13:10:31 +10:00
Will Marshall
19137ce309 Adding state to home page filtering 2014-05-02 12:57:33 +10:00
Will Marshall
9bd76df116 That wasn't actually a bug! Sorry 2014-05-02 12:52:51 +10:00
Will Marshall
794d7b69ae Restoring our toggle option 2014-05-02 12:50:32 +10:00
Will Marshall
34f170d4f7 Bugged thing in the shop spec 2014-05-02 10:18:57 +10:00
Will Marshall
2d536e01e7 Patching some deadlocks 2014-05-01 17:21:46 +10:00
Will Marshall
0956aa2532 Patching a bug in order cycle partial 2014-05-01 17:08:15 +10:00
Will Marshall
6ad30d901d Tidying down shop/checkout test 2014-05-01 16:22:11 +10:00
Will Marshall
e65924c50f Removing a dud reference to active' 2014-05-01 15:52:27 +10:00
Will Marshall
2ff2d3dcbd Starting to work on test format 2014-05-01 15:51:40 +10:00
summerscope
c1ab0c0f0b Renaming sass files for relevance. Style tweaks for large input to fix firefox bug. 2014-04-30 16:12:39 +10:00
Will Marshall
8a5b93ace9 Adding a couple of basic feature tests for the sake of demonstration 2014-04-30 16:10:02 +10:00
summerscope
4ed81da022 Updates to styling homepage and active table 2014-04-30 15:36:42 +10:00
summerscope
dcacf01c1d Tweaking copy for food hubs modals. 2014-04-30 15:05:41 +10:00
Will Marshall
e901f3439a Starting to partialize and test the RABL partials 2014-04-30 13:52:06 +10:00
Will Marshall
0f6bd7049c Starting to build out producers Angular page 2014-04-30 12:52:47 +10:00
Will Marshall
e7d6e7e564 Removing the sidebar before filter stuff, since we're not using it anymore 2014-04-30 12:15:57 +10:00
Will Marshall
f68a637609 Renaming Enterprise.active to Enterprise.visible 2014-04-30 12:09:22 +10:00
Will Marshall
4ca148ee93 Starting on the producers controller 2014-04-30 12:05:53 +10:00
Will Marshall
563976c084 Adding an active scope and test to Enterprise 2014-04-30 12:02:11 +10:00
Will Marshall
b6ffb863ce Adding mailto directive 2014-04-30 11:41:53 +10:00
Will Marshall
149d0fc9b5 Merging in master and adding footer email changeS 2014-04-30 11:18:38 +10:00
Will Marshall
1ef317c17b Adding reversed email address to footer 2014-04-30 11:12:29 +10:00
Will Marshall
22aaa24962 Disabling scroll increment/decrement on Number inputs 2014-04-30 10:57:30 +10:00
summerscope
df73e8f63c new SVGs 2014-04-29 16:39:45 +10:00
summerscope
31f7d51c2f More homepage styling, updated svgs, remove unused images, more styling and markup 2014-04-29 16:38:25 +10:00
summerscope
9d0d7f85f6 Styling footer and beta sections. 2014-04-29 15:51:05 +10:00
summerscope
5e6ac747b3 More styling for active table. tweak naming conventions to make appropriate - more generic for active_table, more specific for home_panes. 2014-04-29 14:24:18 +10:00
summerscope
f13ca0a40d More homepage styling for panes 2014-04-29 13:35:44 +10:00
summerscope
1de5efb172 Changing color naming convention and updating all stylesheets 2014-04-29 12:37:49 +10:00
summerscope
c615a805f3 More styling for active table so nodes which are inactive have different interactive states 2014-04-29 11:45:08 +10:00
summerscope
fa68f49898 Slicing pictures for web production 2014-04-29 10:38:08 +10:00
Will Marshall
c33fa03736 Merging into master 2014-04-29 10:35:05 +10:00
Will Marshall
c60836af64 Adding modernizr to 2014-04-29 10:08:12 +10:00