Rob Harrington
c44f9d2537
Making text (and links) within shopfront message more legible
2016-05-25 08:10:20 +10:00
Continuous Integration
f90e7d3239
Merge remote-tracking branch 'origin/master' into HEAD
2016-05-06 13:58:37 +10:00
Rohan Mitchell
36a4aab020
Adjust styling to blend
2016-04-29 15:07:55 +10:00
Bing Xie
824a29624f
Tweak the map UI
2016-04-27 14:17:29 +10:00
Bing Xie
daa5b00a2a
Uses openstreetmap tiles
2016-04-27 13:50:15 +10:00
Steve Pettitt
53d50f16d6
Merge current master
2016-04-26 03:18:27 +01:00
Rohan Mitchell
cfe062918b
When a variant goes out of stock, disable the input and grey out the row
2016-04-21 09:36:23 +10:00
Steve Pettitt
0b820361de
Merge master
2016-04-15 08:29:52 +01:00
Steve Pettitt
bc048a943c
Show all payments, format unsuccessful payments grey, add 'invalid' translation.
2016-04-10 22:23:39 +01:00
Maikel Linke
97bcbb81b9
Change text of register call in the dropdown
...
Unified code for the dropdown and the footer.
Both contain the register call and are both pointing to the register
path now. The footer still pointed to the global site before.
2016-04-01 14:39:43 +11:00
Maikel Linke
04f661f646
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into hide-closed-shops
...
Conflicts:
config/locales/en.yml
2016-04-01 13:02:53 +11:00
Maikel Linke
813dff8af2
Merge branch 'master' of github.com:openfoodfoundation/openfoodnetwork into require-login
2016-04-01 11:04:36 +11:00
Maikel Linke
db0b345241
Add "Show all on map" button under shops
2016-03-31 15:24:43 +11:00
Maikel Linke
5149c5118b
Change text and style for shops requiring login
2016-03-24 21:42:21 +11:00
Maikel
388b25ddf9
Auto-merged master into uk/account-balances on deployment.
2016-03-12 09:11:42 +11:00
Maikel Linke
23a1c2a772
Remove scroll bar from enterprise modal description
...
Multiple scroll bars within a modal were confusing. The inner scroll bar
for the long enterprise description got removed. The general modal
scroll bar persists.
Fix #806 Full profile modal about section copy display improvement
2016-03-02 10:42:40 +11:00
Steve Pettitt
d39b62aa31
Fallback to a default tractor logo if missing
2016-02-20 19:00:37 +00:00
Steve Pettitt
ec3e158781
Merge current master
2016-02-20 17:24:57 +00:00
Steve Pettitt
23e774bede
Styling, fewer columns in small/medium screen, logo resize
2016-02-20 17:20:43 +00:00
Maikel Linke
3db79aa6b2
Prevent body from scrolling when a modal is open
2016-02-05 15:18:18 +11:00
Steve Pettitt
0ad3d8f351
WIP: styling updates
2016-02-02 23:21:04 +00:00
Steve Pettitt
4438cbd5d0
Merge branch 'uk/account-balances' of https://github.com/openfoodfoundation/openfoodnetwork into uk/account-balances
2016-01-30 19:53:53 +00:00
Steve Pettitt
ec6b0f873e
style credit/debit, spec updates
2016-01-30 19:53:37 +00:00
Steve Pettitt
92d830b884
Table styling
2016-01-30 17:56:04 +00:00
Maikel Linke
1f1b0bd783
styling groups blurb
2016-01-22 16:20:07 +11:00
Maikel Linke
fd9de730c8
group producer style adjustment
2016-01-20 13:32:08 +11:00
Rohan Mitchell
07d691fc97
Only apply cart scrolling to non-mobile devices
2016-01-15 16:54:56 +11:00
Maikel
826d045532
Auto-merged master into cart-fit-to-screen on deployment.
2016-01-13 16:12:41 +11:00
Rohan Mitchell
a07eabca55
Fit cart to screen and allow scrolling so we can always access all of it
2016-01-13 16:00:43 +11:00
Nicolas Blanc
770a8d0b17
#771-minor-bug-on-Firefox
...
Z-index:1 solved problem on Firefox. It works on Chrome too.
2016-01-10 09:54:35 +01:00
Rob Harrington
cb1f79f59a
Updating front end order details, invoices and pdfs to display names of line_items as opposed to variants
2015-10-28 15:42:14 +11:00
Maikel Linke
e25805aa78
Restoring all changes of the last combined branch
...
This reverts commit 1e55e8a907
2015-09-10 15:03:13 +10:00
Maikel Linke
1e55e8a907
Reverting all changes of the last combined branch
...
The production server hangs on certain requests. To rule out a code bug,
we revert to the last deployed version.
2015-09-10 12:50:40 +10:00
Maikel Linke
2e3ff8f5c6
doubling cart buttons
2015-09-03 15:52:54 +10:00
Rohan Mitchell
61435b2dea
Add brand guide colours next to definition
2015-07-17 17:05:44 +10:00
Rohan Mitchell
b6892c82f1
Rename australia-orange sass var to country-agnostic brand-colour
2015-07-17 16:27:17 +10:00
Rohan Mitchell
07e6a204f3
Do not bindonce ng-repeat, remove translateZ(0) optimisation - address dangling DOM nodes after ng-repeat finishes.
...
https://github.com/angular/angular.js/issues/4490
2015-07-10 17:45:16 +10:00
Rohan Mitchell
46792a4111
Style results tables
2015-07-10 17:45:16 +10:00
Rohan Mitchell
960e4d3015
Scale logo down when display is very short (ie. iPhone 4)
2015-07-01 15:38:50 +10:00
Rohan Mitchell
7e685b646f
Fine-tune header sizes on home page and cutover point for page_alert responsiveness
2015-06-26 15:54:26 +10:00
Rohan Mitchell
eef302635b
Fix alert overflow on mobile
2015-06-26 15:54:26 +10:00
Rohan Mitchell
6105d008df
Show CTA above the fold on iPhone 5
2015-06-26 15:54:26 +10:00
Rohan Mitchell
dd04afe8f8
Make alert box more legible
2015-06-26 15:54:25 +10:00
Rohan Mitchell
c97ed026d0
Make room in menu for shopping@ text
2015-06-26 15:54:25 +10:00
Rohan Mitchell
4da367a94b
Put OFN logo in top bar of mobile site
2015-06-26 15:54:25 +10:00
Rohan Mitchell
bf953f8987
Undo last change, it broke asset precompilation. Rename style.css to scss for inclusion and force recompilation of all assets.
2015-06-16 18:25:44 +10:00
Rohan Mitchell
0ade5ee3a8
Import style.css file also (not included by default by @import)
2015-06-16 18:00:35 +10:00
Rohan Mitchell
faee88c404
Merge branch 'master' into redesign
2015-06-16 16:57:09 +10:00
Rohan Mitchell
bf2a7f12e0
Fix interaction between alert and mobile menu. A bit hack-ish, needs some more love.
2015-06-16 16:28:45 +10:00
Continuous Integration
c76021462c
Auto-merge from CI [skip ci]
2015-06-16 14:12:16 +10:00
