15241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Matt-Yorkley	a7771a20c4	Adjust border-radius on filters button	2020-05-10 09:44:11 +02:00
Matt-Yorkley	03afae01b3	Decrease sidebar width on mobile for more tapping space	2020-05-10 09:44:11 +02:00
Matt-Yorkley	96c6da304a	Increase margin between filter selectors	2020-05-10 09:44:11 +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	14d928c39d	Fix feature specs where UI has changed	2020-05-10 09:44:11 +02:00
Matt-Yorkley	6b66787004	Update "no results" layout on mobile and tablet	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	ff69389bb0	Make search bar "sticky" for tablets and mobile	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	865dcf79cb	Extract some properties to variables	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	d1ea2c5f77	Extract shop searchbar styles to separate file	2020-05-10 09:44:11 +02:00
Matt-Yorkley	035bde9eff	Define breakpoints in mixin and refactor	2020-05-10 09:44:11 +02:00
Matt-Yorkley	cbd77b4941	Improve element sizing and position on small screens	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	e25e4e7482	Fix issue with button submitting form instead of opening popup	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	94145d0f7e	Improve layout and sizing on mobile	2020-05-10 09:44:11 +02:00
Matt-Yorkley	da1d8e90e2	Update search placeholder	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	0d9f049d24	Add inner icon and restyle search input element	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
Matt-Yorkley	3ca491683a	Merge pull request #5317 from Matt-Yorkley/caching-timed-shops ... [Caching] Timed caching on shops data	2020-05-09 15:33:26 +02:00
Pau Pérez Fabregat	b85e439b0e	Merge pull request #5395 from coopdevs/skip-broken-spec ... Skip unreliable caching test	2020-05-08 17:11:12 +02:00
Pau Perez	fa8c1270ce	Skip unreliable caching test ... This spec failed two times in a row and it's blocking the release.	2020-05-08 16:37:30 +02:00
Pau Pérez Fabregat	09caf88b6c	Merge pull request #5396 from coopdevs/fix-brittle-test ... Make test not depend on response's order	2020-05-08 16:37:06 +02:00
Pau Perez	b99bcc3c12	Make test not depend on response's order ... I'm assuming this is failing in CI due to the order in which the closed shops are returned.	2020-05-08 15:56:20 +02:00
Pau Perez	ad70a63370	Update all locales with the latest Transifex translations	2020-05-08 12:01:42 +02:00
Pau Pérez Fabregat	60470aaf9f	Merge pull request #5332 from coopdevs/add-timestamps-to-oc-schedule ... Add timestamps to OC schedule join table	2020-05-08 10:51:43 +02:00
Pau Pérez Fabregat	2cf407ce35	Merge pull request #5349 from openfoodfoundation/transifex ... Transifex	2020-05-08 10:20:07 +02:00
Pau Pérez Fabregat	c38c59b0b9	Merge pull request #5223 from luisramos0/def_user ... Change default user from spree@example.com to ofn@example.com ❤️	2020-05-08 09:51:31 +02:00
Luis Ramos	424932d61b	Merge pull request #5262 from luisramos0/closed_shop_msg ... [Mobile] Improve the design of shop page messages (closed shop, private shop and select OC)	2020-05-08 07:52:58 +01:00
Matt-Yorkley	5518ffa856	Ensure validations are called when updating attributes in test	2020-05-07 19:37:43 +02:00
Luis Ramos	dd5041db65	Remove unnecessary default user email and pwd from docker setup ... These are now the default values in the app	2020-05-07 18:18:42 +01:00
Luis Ramos	052dbca1ba	Merge pull request #5370 from Matt-Yorkley/dont-render-twice ... Don't render twice	2020-05-07 18:15:47 +01:00
Matt-Yorkley	86bfd1bebb	Add explanatory comments on usages of Timecop.travel	2020-05-07 17:29:58 +02:00
Luis Ramos	468576ee8a	Merge pull request #5329 from romale/master ... Correct translations	2020-05-07 16:04:24 +01:00