Luis Ramos
|
3b2c10526d
|
Merge pull request #4838 from openfoodfoundation/dependabot/bundler/jquery-rails-3.1.5
[Security] Bump jquery-rails from 3.0.4 to 3.1.5
|
2020-03-20 09:49:22 +00: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 |
|
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 |
|
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 |
|
Matt-Yorkley
|
5ce5072f26
|
Adjust position of OC popover tip to not cover up the "ready for" label
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
35133f7ee8
|
Adjust height of ordercycle selector on desktop
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
5becbc2a11
|
Move caret svg to /app/assets/images
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
390d80f0eb
|
Update order cycle selector positioning
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
6da43850d1
|
Restyle order cycle dropdown
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
a146bdacc8
|
Realign ordercycle text on tablet downwards
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
43cadb00c4
|
Recolour order cycle selector
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
2e616a9e31
|
Fix conditional display of order cycle selection element
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
1927e2883e
|
Move brackets inside conditionals for rendering last closed / next open message
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
a4b94cf39f
|
Add dividing line on tabs
Shows a thin grey line when the tab view content is white, but doesn't interfere when the content below is a full-width colour image.
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
a35f3c130e
|
Recolour shop tab buttons
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
a93243a8b7
|
Change vertical position of shop name in relation to logo
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
de4402457a
|
Improve layout and positioning on mobile and tablet
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
bf9f7309f7
|
Adapt style definitions to altered layout
|
2020-03-17 20:23:45 +01:00 |
|
Matt-Yorkley
|
4b0e1610ec
|
Update order cycle selection box
|
2020-03-17 20:23:45 +01:00 |
|
Maikel Linke
|
6b8b3be524
|
Show "Back To Store" button when no shop has been selected yet
|
2020-03-17 10:28:03 +11:00 |
|
Maikel Linke
|
1db8283e98
|
Link "Back To Store" button to products page
|
2020-03-17 10:28:03 +11:00 |
|
Maikel Linke
|
5fce40ee71
|
Link "Continue shopping" to products tab
|
2020-03-17 10:28:03 +11:00 |
|
Maikel Linke
|
c64493ca77
|
Continue shopping with the products list
|
2020-03-17 10:28:03 +11:00 |
|