Matt-Yorkley
b4e5542e5f
Extract re-usable sidebar styes
2020-06-18 22:21:54 +02:00
Matt-Yorkley
add38bf550
Use #image_path helper correctly
...
Paths should be relative. For example an image under `/app/assets/images/home/banner.jpg` should be: `image_path("home/banner.jpg")`
2020-06-16 18:25:13 +02:00
Pau Pérez Fabregat
4d3ae8fa53
Merge pull request #5439 from coopdevs/fix-misplaced-paragraph
...
[mobile ux] Fix misplaced paragraph in shop tab
2020-05-27 08:51:13 +02:00
Pau Pérez Fabregat
da88399ca6
Merge pull request #5411 from Matt-Yorkley/orders-closed-fullwidth
...
Fix closed shop message not displaying full-width
2020-05-22 19:32:08 +02:00
Pau Perez
be9fbae300
Fix misplaced paragraph in shop tab
...
By wrapping message within 12-cols container, keeping consistency with
the other shop tabs.
2020-05-22 12:37:07 +02:00
Matt-Yorkley
70e3f0f1f1
Fix closed shop message not displaying full-width
2020-05-12 18:29:48 +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
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
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
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
2964ec138d
Update display of join words in filters list and rearrange code a bit for clarity
...
Here we need to build a really dynamic structure on the page like "Results for: <search-term> in <filter1> or <filter2>" and the styling on each of the words needs to be a bit different, specifically the filter terms need to be differently styled to the join words like "in" and "or". We have to generate those bits on the Angular side, but they also have to be wrapped in HTML in a specific way.
$sce.trustAsHtml() marks the injected HTML as "safe" (in relation to security issues like XSS). In this case the injected content doesn't involve any user-defined data, so it should be fine.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
4b695014e4
Update "no results" styling
2020-05-10 09:44:11 +02:00
Matt-Yorkley
c9bfccf465
Update styling on search feedback bar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
026b98022c
Add clear search button in shop searchbar
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f24969edb1
Remove gutter padding on shop content to gain a bit more horizontal real-estate
2020-05-10 09:44:11 +02:00
Matt-Yorkley
cbb67e15ed
Extract button styles
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ebe00bdc31
Update filters clear button functionality
2020-05-10 09:44:11 +02:00
Matt-Yorkley
9eaf55f4c0
Add missing translation key
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f337fd49e1
Extract search feedback bar into partial and move into main column
2020-05-10 09:44:11 +02:00
Matt-Yorkley
ff07b97033
Add sidebar footer and buttons
...
Also includes a minor refactor to resolve an issue with animation timings. Angular was not adding the "shown" class to the different elements at the same time in the digest cycle, and it looked a bit shaky.
2020-05-10 09:44:11 +02:00
Matt-Yorkley
7c00d41fc4
Add some animation effects
2020-05-10 09:44:11 +02:00
Matt-Yorkley
8e9833fd06
Implement overlaid sidebar on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f43bf3880c
Add filters button on mobile and tablet
2020-05-10 09:44:11 +02:00
Matt-Yorkley
142cef3f3a
Add filters count
2020-05-10 09:44:11 +02:00
Matt-Yorkley
f46ca0c595
Move search to new searchbar
...
This required a lot of refactoring, as the search needed to be inside both the form element and the Angular ProductsCtrl element, but to get a full-width row for the searchbar it needed to be outside of the 12 column layout of the other shop page elements...
2020-05-10 09:44:11 +02:00
Matt-Yorkley
532e27b7e1
Move filters into new column on desktop
2020-05-10 09:37:56 +02:00
Luis Ramos
3c7970f72f
Add select oc message when there are multiple OCs
2020-05-07 12:18:40 +01:00
Luis Ramos
0d6d071db2
Remove dead class .shopfront_hidden_message
2020-05-07 12:17:43 +01:00
Luis Ramos
ba25986756
Fix some css rubocop issues
2020-05-07 12:17:43 +01:00
Luis Ramos
098ad6f250
Merge partial messages back to home partial where it is only used
2020-05-07 12:17:43 +01:00
Luis Ramos
319657d2c5
Move closed shop partial to /messages
2020-05-07 12:17:43 +01:00
Luis Ramos
eb773a813e
Extract open shop message to partial
2020-05-07 12:17:43 +01:00
Luis Ramos
5dedbc4231
Extract customer_required message to separate partial
2020-05-07 12:17:43 +01:00
Luis Ramos
84c00fe215
Remove duplicate conditionals already present in ShopHelper#shop_tabs, when these partials are rendered, these conditions will always be true
...
In the shops partial, by adding the else, we avoid rendering empty space with an empty
products list in case the shop is closed
2020-05-07 12:17:43 +01:00
Luis Ramos
77d7d2b804
Make the background darker only in specific cases
2020-05-07 12:17:43 +01:00
Luis Ramos
b34fb79d69
Move content div to messages partial so that it's not used in the closed shop message (no margin according to design)
2020-05-07 12:17:43 +01:00
Luis Ramos
1c41061f9e
If shop is closed show closed shop message partial in the home tab
2020-05-07 12:17:43 +01:00
Luis Ramos
b86081090f
Extract closed shop message to a partial
2020-05-07 12:17:43 +01:00
Luis Ramos
e0b3e9a040
Remove border of message and paddings, add background color, change link color and split message in two lines
2020-05-07 12:17:43 +01:00
Luis Ramos
ea75714561
Merge pull request #4635 from luisramos0/main_app_routes
...
Replace use of spree.root_path and root_url with main_app.root_path and main_app.root_url
2020-02-04 16:02:48 +00:00
Matt-Yorkley
a1256f9aeb
Remove old green box styling from shopfront messages
2020-01-19 15:57:01 +01:00
Matt-Yorkley
d508e7772c
Fix angular templates bug
...
Angular controller data was being partially preserved when switching back and forth between tab templates, causing the ProductsCtrl to hold duplicate datasets when it is re-initialized after going from the shop tab to another tab, then back again.
2020-01-13 17:05:28 +01:00
Matt-Yorkley
e7d88f0df9
Move "orders closed" message to "shop" tab and adjust "home" tab message display logic
2020-01-13 17:05:28 +01:00
Matt-Yorkley
49aacf879f
Change row nesting to fix product list layout display issues
2020-01-13 17:05:28 +01:00
Matt-Yorkley
48f329a716
Rework layout and CSS
2020-01-13 17:05:26 +01:00
