16379 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Transifex-Openfoodnetwork	fd6cbe064d	Updating translations for config/locales/tr.yml	2020-06-19 20:27:09 +10:00
Pau Pérez Fabregat	db80992326	Merge branch 'master' into drop-blockenspiel	2020-06-19 12:12:10 +02:00
Matt-Yorkley	444097c75f	Merge pull request #5559 from luisramos0/display_only_shop ... Make display only shops work again	2020-06-19 11:12:55 +02:00
Matt-Yorkley	be4a4c48d9	Merge pull request #5480 from Matt-Yorkley/mobile-cart-restyle ... [Mobile] Cart Dropdown	2020-06-19 09:25:04 +02:00
Matt-Yorkley	b189d06eb7	Update shopping CTA logic ... Shows "Take me shopping!" button on /shops page if a shop is selected	2020-06-19 08:59:43 +02:00
Lucas Hiago	52da896b03	Fix name when try to search on seed	2020-06-18 21:06:04 -03:00
Eduardo	573f7b1087	make shop links on the producers page open in new tab	2020-06-18 19:55:06 -03:00
Matt-Yorkley	ff6ba8819f	Use image_tag helper with relative paths when loading static images in /app/assets/images folder ... This seems to be needed for Rails 4	2020-06-18 22:22:31 +02:00
Matt-Yorkley	7c7ab322bb	Ensure cart-header has the same height when the cart is empty ... Fixes a minor visual bug	2020-06-18 22:21:55 +02:00
Matt-Yorkley	5a480439ca	Remove test for items from previous orders looking in cart dropdown ... This feature has been removed	2020-06-18 22:21:55 +02:00
Matt-Yorkley	a6edc1c973	Enable control over body scroll with BodyScroll service	2020-06-18 22:21:55 +02:00
Matt-Yorkley	ed086c2db5	Add character limit to product and variant names in cart sidebar	2020-06-18 22:21:55 +02:00
Matt-Yorkley	2cc02d9711	Make cart header stick to top of cart	2020-06-18 22:21:55 +02:00
Matt-Yorkley	886df0e87d	Fix cart page button style regression	2020-06-18 22:21:55 +02:00
Matt-Yorkley	076ecfdb43	Adjust scrollbar visibility in sidebar	2020-06-18 22:21:55 +02:00
Matt-Yorkley	7093e0f7a3	Use plural or singular description in cart, depending on number of items	2020-06-18 22:21:55 +02:00
Matt-Yorkley	850e1b0364	Reduce specificity in cart css rules	2020-06-18 22:21:55 +02:00
Matt-Yorkley	b58ccc02ee	Adjust shop.css.scss and remove indentation	2020-06-18 22:21:55 +02:00
Matt-Yorkley	234f0f94cf	Change images in serializer to use product.images over variant.images	2020-06-18 22:21:55 +02:00
Matt-Yorkley	9c6dd1b324	Add comment on z-index	2020-06-18 22:21:55 +02:00
Matt-Yorkley	1eb9d11e27	Update colour variables	2020-06-18 22:21:55 +02:00
Matt-Yorkley	17c2721ab6	Remove unused translation keys	2020-06-18 22:21:55 +02:00
Matt-Yorkley	656c23f407	Replace previous min-width breakpoint. ... This was mistakenly changed to use a max-width breakpoint in a previous commit.	2020-06-18 22:21:55 +02:00
Matt-Yorkley	1d8386bee8	Disable two SCSS-lint rules	2020-06-18 22:21:55 +02:00
Matt-Yorkley	c0282b57b6	Fix some linting warnings	2020-06-18 22:21:55 +02:00
Matt-Yorkley	042b4fc395	Remove tests for viewing previous order items in cart dropdown ... This behavior has been removed	2020-06-18 22:21:55 +02:00
Matt-Yorkley	bd97939062	Move homepage "register here" CTA to bottom of screen. ... The CTA breaks the layout when the new cart sidebar is open. I can't see a nice way to keep it at the top without making a mess.	2020-06-18 22:21:55 +02:00
Matt-Yorkley	2bcadd52e8	Hide "Take me shopping" button on /shop and /shops pages	2020-06-18 22:21:55 +02:00
Matt-Yorkley	387a5ec950	Implement "Take me shopping" button	2020-06-18 22:21:55 +02:00
Matt-Yorkley	10b8470e29	Set a fixed width for cart sidebar on tablet up	2020-06-18 22:21:55 +02:00
Matt-Yorkley	4acb08e52b	Update hamburger menu icon	2020-06-18 22:21:55 +02:00
Matt-Yorkley	786348bc71	Remove colon from cart total text	2020-06-18 22:21:55 +02:00
Matt-Yorkley	8ac971651c	Fix flaky spec	2020-06-18 22:21:55 +02:00
Matt-Yorkley	459e53f43d	Adjust specs for new cart display	2020-06-18 22:21:55 +02:00
Matt-Yorkley	2f2ef28351	Use links instead of buttons and fix up styles	2020-06-18 22:21:55 +02:00
Matt-Yorkley	b74b9fbd1d	Shift sidebar down vertically (below navigation) and bring navigation up (z-index)	2020-06-18 22:21:55 +02:00
Matt-Yorkley	4a0f43a831	Ensure cart item count is visible in header cart button (for screens smaller than desktop)	2020-06-18 22:21:55 +02:00
Matt-Yorkley	439674ad9c	Make cart view fullwidth on mobile	2020-06-18 22:21:55 +02:00
Matt-Yorkley	8ca0119f5d	Add empty cart feedback	2020-06-18 22:21:55 +02:00
Matt-Yorkley	95686eda78	Update translations	2020-06-18 22:21:54 +02:00
Matt-Yorkley	7efccac7bb	Add close functionality to close button	2020-06-18 22:21:54 +02:00
Matt-Yorkley	4362b8b25b	Improve line spacing on cart product list	2020-06-18 22:21:54 +02:00
Matt-Yorkley	be8c0f3600	Remove old cart dropdown view and directive	2020-06-18 22:21:54 +02:00
Matt-Yorkley	33a2dd100e	Add new layout for cart sidebar	2020-06-18 22:21:54 +02:00
Matt-Yorkley	400fce8ef9	Separate cart page and cart dropdown styles	2020-06-18 22:21:54 +02:00
Matt-Yorkley	b4e5542e5f	Extract re-usable sidebar styes	2020-06-18 22:21:54 +02:00
Matt-Yorkley	a8b981e9cd	Add product thumbnais to serializer for cart dropdown images	2020-06-18 22:21:54 +02:00
Matt-Yorkley	b1ce7f2c15	Simplify product naming in cart	2020-06-18 22:21:54 +02:00
Matt-Yorkley	85abfd2056	Create Cart sidebar and controller	2020-06-18 22:21:54 +02:00
Matt-Yorkley	7290d68687	Update all locales with the latest Transifex translations	2020-06-18 20:46:41 +02:00