summerscope
75055300e3
Adding comments into Footer for CMS implementation stuff with Rohan
2015-05-05 14:56:11 +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
Rohan Mitchell
63ec0d7dcf
Merge branch 'master' into folklabs-producer-emails
2015-05-05 11:48:31 +10:00
summerscope
ae221f0416
Remove clashing padding classes
2015-05-04 23:02:33 +10:00
summerscope
924efec49c
Add animation class to make consistent with Hubs and Producers.
...
Remove class .animate-repeat
2015-05-04 22:59:48 +10:00
summerscope
9082da6d5e
Remove animation from search field, add to group nodes
2015-05-04 22:57:07 +10:00
summerscope
91afbaca4b
Fixing name-space clash in footer
2015-05-04 22:49:10 +10:00
summerscope
2736421460
First cut at Groups landing page for sign up.
2015-05-04 22:42:14 +10:00
summerscope
84c2faddd5
Adding new link to footer
2015-05-04 22:19:33 +10:00
summerscope
0510fa27e6
More design tweaks for homepage and conversion pages
2015-05-04 18:23:04 +10:00
summerscope
41fb44c19b
More styling on pricing table
...
Remove middle column
2015-05-04 14:33:03 +10:00
summerscope
938358007a
> More styling for landing pages for signup
...
> Add signup page for groups / food systems partners
> Change link in footer
2015-05-04 13:44:35 +10:00
summerscope
503c483acd
Tweak language
2015-05-04 13:16:18 +10:00
summerscope
3091b365ec
Adding in logos for case studies
...
More styling on signup pages
2015-05-04 13:15:18 +10:00
Rick Giner
8fb11defdb
bind-once in groups home page
2015-05-03 14:41:34 +10:00
Rick Giner
3fc616cdff
bind-once on hubs
2015-05-03 14:11:09 +10:00
Rick Giner
16e9f0545b
bind-once in products
2015-05-03 14:02:33 +10:00
Rick Giner
a3664d4448
Added bindonce and ng-if improvements to Producers templates
2015-05-03 12:51:59 +10:00
summerscope
36838ed457
Hubs signup page WIP styling
2015-05-02 21:49:01 +10:00
summerscope
9a0e9145ef
Adding more logic to force padding for shopfront page whether populated with products or not.
2015-05-02 20:25:23 +10:00
summerscope
1090328a3c
Adding padding class and apply to templates to have required padding for new footer.
2015-05-02 20:12:33 +10:00
summerscope
ddde4e9dcb
WIP producers signup page markup
2015-05-02 18:25:23 +10:00
summerscope
3dbe45172d
Registration markup tweak with new icons
2015-05-02 18:24:55 +10:00
summerscope
4cb0158b21
Add in link for Regional founders user types - to send back to global site
2015-05-02 18:23:42 +10:00
summerscope
4f145104d2
Update mailer to new logo - should be instance specific (e.g. UK, AUS, etc.)
2015-05-02 17:58:35 +10:00
summerscope
fd90da6868
Shops landing page - adding info pane and copy with Jay.
2015-05-02 16:02:18 +10:00
summerscope
330d23c606
Move alert for 'join now' off global template onto homepage template only.
2015-05-02 15:23:12 +10:00
summerscope
5f193bc9ae
More styling for homepage panes.
2015-05-02 15:20:51 +10:00
summerscope
0086066ea5
WIP on How does it work pane on homepage
2015-05-02 13:58:57 +10:00
summerscope
7b8b53854e
More WIP on homepage layout etc.
2015-05-01 18:46:39 +10:00
summerscope
53e2bc823d
WIP styling and content for homepage
...
> footer
> alert @ top
> call to action buttons
2015-05-01 18:19:51 +10:00
Maikel Linke
2edf5aeccd
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into bulk-product-edit
2015-05-01 15:05:14 +10:00
Rohan Mitchell
03ae740cd6
Revert "Display header for Xero invoices report"
...
This reverts commit a6cecdcc25
2015-05-01 14:55:26 +10:00
summerscope
d9fd0b284d
WIP on home panes and layout
2015-05-01 14:52:17 +10:00
summerscope
e1beae98ab
WIP on redesign / layout job
...
> adding in new design assets
> copy and layout for homepage partials
> more global styling updates
2015-05-01 14:41:48 +10:00
Rohan Mitchell
153604dd64
Merge branch 'single-order-patches'
2015-05-01 14:39:17 +10:00
Rohan Mitchell
a6cecdcc25
Display header for Xero invoices report
2015-05-01 11:59:52 +10:00
Maikel Linke
baabb5c07f
fixing BPE feature spec
2015-05-01 11:30:26 +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
Maikel Linke
66f847f673
showing save button at the bottom as well
2015-04-30 17:22:54 +10:00
Rohan Mitchell
6b1c125b03
Merge branch 'producer-emails' of https://github.com/folklabs/openfoodnetwork into folklabs-producer-emails
...
Conflicts:
Gemfile.lock
app/controllers/admin/order_cycles_controller.rb
app/views/admin/order_cycles/edit.html.haml
app/views/admin/order_cycles/show.rep
db/schema.rb
spec/controllers/admin/order_cycles_controller_spec.rb
2015-04-29 14:42:17 +10:00
Rob Harrington
992fb2347d
Merging master branch into require_standard_variant
2015-04-29 14:30:49 +10:00
Maikel Linke
f6d87eee87
Merge remote-tracking branch 'origin/master' into single-order-patches
2015-04-29 13:20:44 +10:00
Lynne Davis
9e61a7d083
Adding report type drop down to order_cycle_management_report
2015-04-26 11:03:32 +01:00
Rob Harrington
6a4de7c7e2
Hiding filters on list views because styling is broken
2015-04-24 19:35:18 +10:00
Maikel Linke
3412bc25bf
Edit Orders: more variant info in variant search
...
Displaying variant's full name and the producer's name.
2015-04-23 10:17:01 +10:00
Rob Harrington
0251d8962d
Adding sku to BPE
2015-04-22 21:02:07 +10:00
Rob Harrington
f610a709e1
Adding inherits_properties to BPE
2015-04-22 21:02:06 +10:00
Rob Harrington
a75a76840d
Merging master into require_standard_variant
2015-04-17 21:18:24 +10:00
