Maikel Linke
d337561ea8
Move ShopVariantCtrl to own file and spec it
2020-10-22 15:46:46 +11:00
Maikel Linke
755773e5ad
Style code
2020-10-22 15:46:46 +11:00
Maikel Linke
58f4d7393c
Make quantity labels translatable
2020-10-22 15:46:46 +11:00
Maikel Linke
01c4882759
Replace bulk buy inputs with add-remove-buttons
2020-10-22 15:46:46 +11:00
Maikel Linke
59c13b97ea
Replace quantity input with add-remove buttons
...
The new mobile friendly design contains a nice "Add" button to add
variants to your cart. Once you have the variant in you cart, it's
replaced by plus and minus buttons to adjust the quantity.
Other languages have longer words than "Add" which need to fit on the
button. Since the add button and the +/- buttons should have the same
width, I widened them a little bit so that they fit the longest words
Aggiungi and Добавить.
2020-10-22 15:46:46 +11:00
Maikel Linke
35747dc2b1
Emphasize first identifying name of a variant
...
That can be a variant name or the unit if the name is missing. Putting
the second and third element in the background consistently.
2020-10-22 15:46:45 +11:00
Maikel Linke
7660116792
Display variant name only when set
...
The previous method was falling back to the product name which is
displayed already.
2020-10-22 15:46:45 +11:00
Maikel Linke
8734fb1776
Override *active* states for product properties w/o tooltip
2020-10-22 15:46:45 +11:00
Maikel Linke
9379e21bca
Increase margin between product summary and variants
2020-10-22 15:46:45 +11:00
Maikel Linke
4ab2375832
Reduce margin on the right of product listing
2020-10-22 15:46:45 +11:00
Maikel Linke
1fb544b803
Remove margin of product listing on mobile and tablet
2020-10-22 15:46:45 +11:00
Maikel Linke
96cd5ca1fe
Fix "Place price-breakdown and price in the middle"
2020-10-22 15:46:45 +11:00
Maikel Linke
e1a3c351e5
Fix "Removal of category icon"
2020-10-22 15:46:45 +11:00
Maikel Linke
4f6e900327
Fix "Remove background and border colors from product list"
2020-10-22 15:46:45 +11:00
Maikel Linke
615678db56
Align inline graph vertically
2020-10-22 15:46:45 +11:00
Maikel Linke
526d4f53ad
Remove red overlay and icon on product image hover
2020-10-22 15:46:45 +11:00
Maikel Linke
ca1cb50314
Adjust margins
2020-10-22 15:46:45 +11:00
Maikel Linke
8006870b66
Adjust column widths
2020-10-22 15:46:45 +11:00
Maikel Linke
d02ab109f2
Show product images on mobile
2020-10-22 15:46:45 +11:00
Maikel Linke
fe1618cada
Add description to product listing
...
It's truncated to one line and a click reveals the modal.
2020-10-22 15:46:45 +11:00
Maikel Linke
afed46531c
Remove second line between products, leave one
2020-10-22 15:46:44 +11:00
Maikel Linke
893b6660fc
Change price-breakdown colour to grey
2020-10-22 15:46:44 +11:00
Maikel Linke
3e789fdb84
Show only tabular price breakdown, no graph
2020-10-22 15:46:44 +11:00
Maikel Linke
065314f0e4
Revert "Remove popover indicator"
...
This reverts commit 0bef97a46710c50b8519752009ca9e8c811f8326.
2020-10-22 15:46:44 +11:00
Maikel Linke
952c39f736
Remove popover indicator
2020-10-22 15:46:44 +11:00
Maikel Linke
2b982cfc2e
Show price breakdown on all screens
2020-10-22 15:46:44 +11:00
Maikel Linke
e29be51c45
Place price-breakdown and price in the middle
2020-10-22 15:46:44 +11:00
Maikel Linke
c15828061f
Move unit under name
2020-10-22 15:46:44 +11:00
Maikel Linke
52c8c19dfc
Remove black background from variant name on mobile
...
table-cell gave it a black background.
Also display it on the same line as the quantity input.
2020-10-22 15:46:44 +11:00
Maikel Linke
61d55ff16f
Remove per-variant subtotal from mobile view
2020-10-22 15:46:44 +11:00
Maikel Linke
25e309b8cc
Update link colors to orange and teal
2020-10-22 15:46:44 +11:00
Maikel Linke
9f5cec6d08
Remove tractor in front of producer name
2020-10-22 15:46:44 +11:00
Maikel Linke
03d8ccfe2e
Remove modal open indicator
2020-10-22 15:46:44 +11:00
Maikel Linke
f05563b30f
Removal of category icon
2020-10-22 15:46:44 +11:00
Maikel Linke
b34449832b
Remove background and border colors from product list
2020-10-22 15:46:43 +11:00
Maikel Linke
0febc9e8c2
Remove unused mixin styles
2020-10-22 15:46:43 +11:00
dependabot-preview[bot]
20777bb80f
Bump ddtrace from 0.41.0 to 0.42.0
...
Bumps [ddtrace](https://github.com/DataDog/dd-trace-rb ) from 0.41.0 to 0.42.0.
- [Release notes](https://github.com/DataDog/dd-trace-rb/releases )
- [Changelog](https://github.com/DataDog/dd-trace-rb/blob/master/CHANGELOG.md )
- [Commits](https://github.com/DataDog/dd-trace-rb/compare/v0.41.0...v0.42.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com >
2020-10-22 01:14:35 +00:00
Luis Ramos
032075c04a
Merge pull request #6119 from arku/chore/fire-event-removal
...
Remove fire_event method usage
2020-10-21 21:21:35 +01:00
Transifex-Openfoodnetwork
6e6dd233e8
Updating translations for config/locales/ru.yml
2020-10-22 02:30:07 +11:00
Matt-Yorkley
eb026f2e22
Use "sRBG" colourspace.
...
This seems to be the correct setting, and fixes a bug with the colouring of uploaded images. Further details:
https://imagemagick.org/script/color-management.php
https://www.imagemagick.org/discourse-server/viewtopic.php?t=20501
2020-10-21 14:26:26 +01:00
Matt-Yorkley
92d6168a14
Don't restrict image filetypes to JPG
2020-10-21 13:42:07 +01:00
Luis Ramos
78651012bb
Merge pull request #6177 from santakadev/fix-docker-setup
...
Fix docker local environment setup
2020-10-21 08:45:07 +01:00
Luis Ramos
d01f9b7aa1
Merge pull request #6227 from jhsu802701/fix_docker_scripts
...
docker-compose run --rm web -> docker-compose run web
2020-10-21 08:44:37 +01:00
Transifex-Openfoodnetwork
af9aa6a8db
Updating translations for config/locales/en_FR.yml
2020-10-21 18:35:58 +11:00
Transifex-Openfoodnetwork
2539507df9
Updating translations for config/locales/en_FR.yml
2020-10-21 18:32:58 +11:00
Transifex-Openfoodnetwork
d8b36c5966
Updating translations for config/locales/fr.yml
2020-10-21 18:30:35 +11:00
Jason Hsu
a9feb53294
docker-compose run --rm web -> docker-compose run web
2020-10-20 17:48:46 -05:00
Matt-Yorkley
f5ce0d501d
Merge pull request #5870 from luisramos0/prefs
...
[Bye bye Spree] Bring models app_configuration and preference from spree_core
2020-10-20 21:12:54 +02:00
Luis Ramos
b267f542d1
Merge pull request #5980 from luisramos0/spree_clean_up
...
[Bye bye spree] Some clean up fixes to make it all work without spree
2020-10-20 18:52:54 +01:00
Luis Ramos
9f568c1e9d
Merge pull request #5928 from luisramos0/spree_core_js
...
[Bye bye spree] Bring final bits of js and css from spree_core
2020-10-20 13:20:41 +01:00
