Rohan Mitchell
610a4c03fe
Merge branch 'master' into redesign
...
Conflicts:
app/controllers/home_controller.rb
app/views/producers/index.html.haml
app/views/shared/menu/_mobile_menu.html.haml
app/views/shop/products/_form.html.haml
config/routes.rb
spec/controllers/shops_controller_spec.rb
2015-06-10 18:27:50 +10:00
Rohan Mitchell
50ae331d94
ng-cloak mobile menu
2015-05-29 16:03:16 +10:00
Rohan Mitchell
7da403808c
Style mobile menu [skip ci]
2015-05-13 16:56:49 +10:00
Rohan Mitchell
bf435a8f3d
Make home page what's happening text and about URL configurable
2015-05-06 15:17:28 +10:00
summerscope
af4fe27f31
Adding comments for CMS implementation stuff with Rohan
2015-05-05 14:53:25 +10:00
summerscope
4da6bef639
Removing unused assets. Adding some todo notes. Optimising PNG assets to reduce file size.
2015-05-05 13:35:51 +10:00
summerscope
427f535026
Redesign big chunk of work:
...
> setting up pages for Shops, and shops signup, producers signup
> setting up routes for new pages
> changing fonts to Google Oswald & Roboto
> setting up homepage partials and removing partials no longer required
> changing menu links and labels
2015-04-30 18:20:17 +10:00
summerscope
799c894bd3
Tweak logo embedding to use new version, and use srcset with src as a fallback
2014-10-30 17:03:08 +11: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
7718cf0c48
Fix markup for menu systems - order, remove double-up of ADMIN, consistency of case, design. All the things
2014-07-23 15:35:44 +10:00
Will Marshall
1ed634239d
Major refactoring
2014-06-20 16:31:49 +10:00
Will Marshall
92eca72f4f
Fixing a couple of paths and clearing localStorage when changing distributor
2014-06-06 14:04:48 +10:00
summerscope
33c276c7f7
Adding in new icon fonts to mobile menu partial
2014-06-04 16:08:16 +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
4e463e7087
Showing admin for enterprise or admin user
2014-05-20 15:16:52 +10:00
Will Marshall
685ba3f63a
Fixing my modal and the tests
2014-05-20 12:18:28 +10:00
Will Marshall
e7f6a9badf
Adding data to groups page
2014-05-20 12:18:28 +10:00
Rohan Mitchell
34c18b522c
Fix incorrect admin path
2014-05-09 08:33:26 +10:00
summerscope
64c94793e4
Menu styling for mobile menu
2014-05-08 16:41:18 +10:00
Will Marshall
50f5a1c46f
Hash toggling
2014-05-08 13:19:44 +10:00
Will Marshall
ff20837f50
Fixing a path issue
2014-05-08 11:50:57 +10:00
summerscope
a7ef1295e4
Tweak styles to adjust break point for menu
2014-05-08 11:48:12 +10:00
summerscope
c5376f3862
Reset to head
2014-05-08 11:08:47 +10:00
Will Marshall
3542799349
Removing pointless foundation crud, reworking the login
2014-05-06 18:28:20 +10:00
Will Marshall
dd25bfd345
Starting to rework menu
2014-05-05 15:52:48 +10:00
