Luis Ramos
b4befea606
Fix namespace in spec
2020-03-20 11:07:23 +00:00
Luis Ramos
58465c4645
Adapt routes placeholder in the new catalog engine to make it similar to the other engines
2020-03-20 11:07:23 +00:00
Luis Ramos
0b05312f19
Move cookies spec to web engine and adapt routes to the fact they are now normal main apps routes
2020-03-20 11:07:23 +00:00
Luis Ramos
e209452f8b
Make engine routes just prepend to apps routes instead of creating engine routes
...
This makes things a bit simpler in terms of routing, we avoid a problem running specs and we can still have the engine routes separated in specific files
2020-03-20 11:07:23 +00:00
Luis Ramos
a8078b22f8
Move enterprise fees summaries controller and views to ordermanagement engine
2020-03-20 11:07:23 +00:00
Maikel Linke
b1a274ea27
Update translations
2020-03-20 16:20:21 +11:00
Maikel
00c7b9986b
Merge pull request #5020 from openfoodfoundation/transifex
...
Transifex
2020-03-20 16:15:54 +11:00
Transifex-Openfoodnetwork
9dc18afef0
Updating translations for config/locales/pt_BR.yml
2020-03-20 12:20:04 +11:00
Transifex-Openfoodnetwork
d2d3d767ac
Updating translations for config/locales/en_GB.yml
2020-03-19 23:53:09 +11:00
Transifex-Openfoodnetwork
a4ff74272b
Updating translations for config/locales/nb.yml
2020-03-19 22:47:36 +11:00
Transifex-Openfoodnetwork
1000dc52bf
Updating translations for config/locales/en_FR.yml
2020-03-19 19:37:32 +11:00
Transifex-Openfoodnetwork
54b8d22e0d
Updating translations for config/locales/fr.yml
2020-03-19 19:37:21 +11:00
Maikel Linke
2d21341183
Update all locales with the latest Transifex translations
2020-03-19 14:06:04 +11:00
Maikel
5cabf59015
Merge pull request #5016 from openfoodfoundation/revert-4879-inner-join-visible-orders
...
Revert "Inner join visible orders"
2020-03-19 12:37:20 +11:00
Maikel
289dff5b91
Merge pull request #4988 from openfoodfoundation/transifex
...
Transifex
2020-03-19 12:06:37 +11:00
Maikel
c4e4beb912
Revert "Inner join visible orders"
2020-03-19 12:01:00 +11:00
Maikel
27d8951add
Merge pull request #5013 from openfoodfoundation/mobile-ux-3
...
Merge mobile-ux-3 branch into master
2020-03-19 11:51:41 +11:00
Transifex-Openfoodnetwork
f7720f1b1f
Updating translations for config/locales/en_FR.yml
2020-03-19 05:18:19 +11:00
Transifex-Openfoodnetwork
c46ae4354d
Updating translations for config/locales/en_FR.yml
2020-03-19 05:15:09 +11:00
Transifex-Openfoodnetwork
5f00323cbb
Updating translations for config/locales/fr.yml
2020-03-19 05:14:27 +11:00
Transifex-Openfoodnetwork
c52f29706b
Updating translations for config/locales/en_CA.yml
2020-03-19 03:47:42 +11:00
Luis Ramos
2590745b2e
Merge pull request #4954 from luisramos0/dead_temp
...
Delete templates that are not used
2020-03-18 13:52:15 +00:00
Matt-Yorkley
6db0421347
Merge pull request #4764 from Matt-Yorkley/mobile-tabs-styling
...
[mobile ux] Mobile tabs styling
2020-03-18 08:42:44 +01:00
Maikel
b63c47cca2
Merge pull request #4816 from mkllnk/1860-copy-paste
...
1860 Remove style from pasted text for shopfront messages
2020-03-18 16:23:50 +11:00
Maikel
2b9f57f4e0
Merge pull request #4998 from mkllnk/4277-signup-flow
...
Direct new enterprise users to their dashboard
2020-03-18 16:17:41 +11:00
Matt-Yorkley
8a1de72542
Center order cycle select elements in tablet view
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2cb3a0cd99
Adjust padding, size, colour (transparency), caret size and position, border-radius, etc
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b0637a24ff
Adjust padding, size, colour transparency, caret size
2020-03-17 20:32:18 +01:00
Matt-Yorkley
d969b68c8c
Add placeholder to order cycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a89d4266d5
Update ordercycleselector to show message in red and remove powertip.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
4b8ced5fc0
Add right-margin on bullet points in groups tab
2020-03-17 20:32:18 +01:00
Matt-Yorkley
2678342122
Reduce padding on ordercycle selector
2020-03-17 20:32:18 +01:00
Matt-Yorkley
b33c819863
Reduce rounding on ordercycle edges (box-radius)
2020-03-17 20:32:18 +01:00
Matt-Yorkley
97d7e27786
Update social icon colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
e73e43838c
Add 2px margin under Contact subheadings
2020-03-17 20:32:18 +01:00
Matt-Yorkley
cdc40fbc38
Update Contact tab subheading text colour
2020-03-17 20:32:18 +01:00
Matt-Yorkley
3430cc617a
Maximise space for tabs to fit on small screens
2020-03-17 20:32:18 +01:00
Matt-Yorkley
ed6f042446
Adjust tab widths/spacing on mobile and tablet
2020-03-17 20:32:18 +01:00
Matt-Yorkley
80a8c436d6
Update box-shadow underneath tab buttons
2020-03-17 20:32:18 +01:00
Matt-Yorkley
049a87e8a9
Remove defunct text-shadow from tab text
2020-03-17 20:32:18 +01:00
Matt-Yorkley
deb5b8e74c
Fix minor display issue where "Ready For" option with lots of characters is too big to fit on screen on mobile.
...
The layout was breaking in some specific cases where the content didn't fit on very small screens.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a5dd14d902
Adjust new colour variables to match Zeplin
2020-03-17 20:32:18 +01:00
Matt-Yorkley
9a6859edc0
Fix CodeClimate issue with SCSS variable naming
2020-03-17 20:32:18 +01:00
Matt-Yorkley
c0c53113d3
Change font on shop tab titles
2020-03-17 20:32:18 +01:00
Matt-Yorkley
26688409a1
Use alternate dots in <ul> display
2020-03-17 20:32:18 +01:00
Matt-Yorkley
0893d14025
Add new shop link colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1
Restyle contact tab
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bd7549c57f
Update layout for producers and groups tabs
2020-03-17 20:23:45 +01:00
Matt-Yorkley
45cf54408d
Readjust layout after rebase
2020-03-17 20:23:45 +01:00
Matt-Yorkley
15360740b1
Add ng-cloak to ordercycle box to improve appearance whilst page loads
2020-03-17 20:23:45 +01:00
