Maikel Linke
7e00f78a77
Highlight menu item only when active or hovered
...
The `:focus` selector meant that every link that was clicked on was
still highlighted after going back or forward in the browser history. We
don't need that selector because tabs you click on are then active and
are highlighted anyway.
2020-03-19 15:49:29 +11:00
Maikel Linke
5a9b5660f1
Simplify logic in PageSelectionCtrl
2020-03-19 15:38:00 +11:00
Maikel Linke
1d42ce885b
Stay on shop page when opening login modal
...
The login modal changes the URL to `#/login` which interfers with our
shop pages. In order to show the right shop page, we need to know which
pages are valid and where we have been before we clicked on Login.
2020-03-19 15:38:00 +11:00
Maikel Linke
17751c448f
Rename PageSelectionCtrl for clarity
2020-03-19 15:37:13 +11:00
Maikel Linke
4b8d9d18d7
Simplify PagesetCtrl
2020-03-19 15:37:13 +11:00
Maikel Linke
ea80ae3832
Enable page navigation via URL fragment
...
The broadcasting of notifications didn't update properly and I couldn't
find a way to listen to $location updates. I replaced the three
intertwined directives with one controller and a bit more HTML code. Now
we have only one scope that listens to $location and all browser actions
like the back button is reflected in the page.
As nice side-effect, the menu links have now the right destination so
that you can copy the link and paste it into another browser window.
40 lines less code.
2020-03-19 15:37:13 +11:00
Maikel Linke
bf26a26743
Reduce complexity by removing unused code branch
2020-03-19 15:36:24 +11:00
Maikel Linke
e3f840f48c
Remove dependency to Tabsets
2020-03-19 15:36:23 +11:00
Maikel Linke
42ca7888c0
Simplify by reducing unused options
2020-03-19 15:36:23 +11:00
Maikel Linke
8aa892136e
Duplicate shop tab code for rewrite
...
The old code is still used on the user page.
2020-03-19 15:36:23 +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
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
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
45cf54408d
Readjust layout after rebase
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
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
Luis Ramos
bd32510837
Merge pull request #4860 from mkllnk/3395-remove-unused-assets
...
3395 remove unused assets
2020-03-12 22:44:41 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Luis Ramos
03c91dfac1
Merge pull request #4780 from luisramos0/bulk_prod_errors
...
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Maikel Linke
8432dab142
Remove unused Javascript manifest
...
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
