Luis Ramos
c3f0c0ed7f
Extract method to prepare work ahead
2020-05-15 14:25:20 +01:00
Matt-Yorkley
c2efa901c2
Don't highlight update button when form is invalid
2020-05-15 13:38:17 +02:00
Luis Ramos
4292636e70
Remove close button in product modal
2020-05-15 12:16:19 +01:00
Luis Ramos
d95b2a97b0
Add missing padding above close button (both for the case with image or just with text) and also below product image
2020-05-15 12:12:07 +01:00
Luis Ramos
edaf419857
Use rem instead of px or em
2020-05-15 12:12:07 +01:00
Luis Ramos
38bc076c77
Fix some rubocop issues
2020-05-15 12:12:07 +01:00
Luis Ramos
30fe457cb5
Make product modal show close button only if there is a scroll bar
2020-05-15 12:12:07 +01:00
Luis Ramos
3a512478d6
Improve the mobile registration modal by adding a margin
2020-05-15 12:12:07 +01:00
Luis Ramos
4b63893377
Improve mobile login modal with a margin
2020-05-15 12:12:07 +01:00
Luis Ramos
50fa4fc93d
Make modal close buttons a little darker with a white cross
2020-05-15 12:12:07 +01:00
Luis Ramos
cbfaaabb72
Adjust different paddings and margins to make mobile product modal contents similar to required design
2020-05-15 12:12:07 +01:00
Luis Ramos
0a378a897b
Add close button to mobile product modal, this can be reused in other modals later
2020-05-15 12:12:07 +01:00
Luis Ramos
35ac5e093e
Adapt modal size to leave some background visible so that user can click to disable modal
2020-05-15 12:12:07 +01:00
Luis Ramos
39e47998e1
Make the background opacity of modals in the FrontOffice a litle darker according to design
2020-05-15 12:12:07 +01:00
Luis Ramos
14478d5fc1
Style producer name and properties in product modal
2020-05-15 12:12:07 +01:00
Luis Ramos
59a13adff0
Remove product category from product modal
2020-05-15 12:11:32 +01:00
Luis Ramos
fee03c4101
Remove repeated/dead rules
2020-05-15 12:11:32 +01:00
Luis Ramos
9a115afd4f
Remove bars around product description and border around product image
2020-05-15 12:11:32 +01:00
Matt-Yorkley
3ba1182661
Dynamically mark quantity field as invalid when stock is incorrect
2020-05-15 12:59:29 +02:00
Matt-Yorkley
42195b76d3
Highlight update button when cart page form is "dirty"
2020-05-15 12:59:29 +02:00
Matt-Yorkley
73b533690e
Refactor cart update button syntax
2020-05-15 12:59:29 +02:00
Matt-Yorkley
78f736db45
Add red border on quantity field when it must be updated
2020-05-15 12:59:28 +02:00
Luis Ramos
4fe1135a33
Merge pull request #5376 from rmklaus12/5104-mobile-keyboard-inputs
...
Added inputmode attribute to show appropriate mobile keyboard for sel…
2020-05-15 08:49:42 +01:00
David Cook
f5629d59b0
5299: Add trailing square brackets for array parameters (distributor and order_cycle)
2020-05-15 15:04:01 +10:00
David Cook
8a2c65b6bb
Remove duplicate line
2020-05-15 15:04:01 +10:00
Luis Ramos
19da0ba969
Merge branch 'master' into 3-0-stable-may13
2020-05-13 19:50:32 +01:00
Luis Ramos
5f7c1474a2
Merge pull request #5377 from manvil/1782_enterprise_at_same_address
...
Handling multiple enterprises at the same location
2020-05-13 19:31:14 +01:00
Luis Ramos
ef2d7f9485
Merge pull request #5330 from openfoodfoundation/mobile-ux-filters
...
[mobile ux] Merge search and filter epic to master
2020-05-13 08:59:32 +01:00
Luis Ramos
58842e8cab
Show order edit link on mobile instead of the cancel link
2020-05-12 19:44:01 +01:00
Matt-Yorkley
598071fa78
Remove conflicting "clear search" buttons added by Chrome
2020-05-12 18:59:15 +02:00
Matt-Yorkley
70e3f0f1f1
Fix closed shop message not displaying full-width
2020-05-12 18:29:48 +02:00
Matt-Yorkley
265a8ed573
Move messages and products form outside of row and columns to enable full-width
2020-05-12 18:24:10 +02:00
Luis Ramos
7804c740a6
Add name to permitted params and fix some rubocop issues
2020-05-12 15:35:47 +01:00
Luis Ramos
41645e8351
Merge pull request #5334 from coopdevs/output-logs-in-djs-log-file
...
Output logs in Delayed Job's log file
2020-05-12 10:05:26 +01:00
Matt-Yorkley
0cd4ad0a1a
Ensure large amount of search text doesn't break layout with clear all button
2020-05-10 09:44:12 +02:00
Matt-Yorkley
9f882a8674
Ensure search results feedback wraps nicely onto next line
2020-05-10 09:44:12 +02:00
Matt-Yorkley
cb9c56d8aa
Ensure correct left-alignment on text in search results feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
dee793a392
Change join word between the two filter sets to be "and", to match the actual logic
2020-05-10 09:44:12 +02:00
Matt-Yorkley
b78976fcd7
Ensure consistent styling in both "no results" and "searching for" text
2020-05-10 09:44:12 +02:00
Matt-Yorkley
82b11d6947
Ensure join words are not bold
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a75d3276a4
Include applied filters list in "no results" feedback
2020-05-10 09:44:12 +02:00
Matt-Yorkley
a1435e78c9
Extract applied filters feedback to partial
2020-05-10 09:44:12 +02:00
Matt-Yorkley
7be85d1dab
Use bold font with teal colour for both applied taxons and applied properties
2020-05-10 09:44:12 +02:00
Matt-Yorkley
483a654d31
Add join word "or" when both categories and properties are present
...
Previously for example with "Organic" property and "Fruit" and "Nuts" categories it rendered as: "Fruit or Nuts Organic" instead of: "Fruit or Nuts or Organic"
2020-05-10 09:44:12 +02:00
Matt-Yorkley
f6b910b38a
Fix clear search (x) button position on some layouts
...
Hopefully this will work on iPhones as well...?
2020-05-10 09:44:12 +02:00
Matt-Yorkley
ea06ec7ede
Remove smaller (less than 1em) scaling in search bar on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
07ac7dd9c7
Add explicit 'search' input type to search field.
...
In theory this should improve some of the custom-keyboard functionality added by mobiles, but the implementations will be vary...
2020-05-10 09:44:12 +02:00
Matt-Yorkley
71fb3b1845
Focus search field after it's cleared, ready for immediate typing of new search term on mobile
2020-05-10 09:44:12 +02:00
Matt-Yorkley
e0cb514cad
Add hover state to filters button with darker background
2020-05-10 09:44:12 +02:00
Matt-Yorkley
5ceaff24e9
Darken overlay background colour to reduce distraction
2020-05-10 09:44:11 +02:00
