Matt-Yorkley
e73e43838c
Add 2px margin under Contact subheadings
2020-03-17 20:32:18 +01:00
Matt-Yorkley
cdc40fbc38
Update Contact tab subheading text colour
2020-03-17 20:32:18 +01:00
Matt-Yorkley
3430cc617a
Maximise space for tabs to fit on small screens
2020-03-17 20:32:18 +01:00
Matt-Yorkley
ed6f042446
Adjust tab widths/spacing on mobile and tablet
2020-03-17 20:32:18 +01:00
Matt-Yorkley
80a8c436d6
Update box-shadow underneath tab buttons
2020-03-17 20:32:18 +01:00
Matt-Yorkley
049a87e8a9
Remove defunct text-shadow from tab text
2020-03-17 20:32:18 +01:00
Matt-Yorkley
deb5b8e74c
Fix minor display issue where "Ready For" option with lots of characters is too big to fit on screen on mobile.
...
The layout was breaking in some specific cases where the content didn't fit on very small screens.
2020-03-17 20:32:18 +01:00
Matt-Yorkley
a5dd14d902
Adjust new colour variables to match Zeplin
2020-03-17 20:32:18 +01:00
Matt-Yorkley
9a6859edc0
Fix CodeClimate issue with SCSS variable naming
2020-03-17 20:32:18 +01:00
Matt-Yorkley
c0c53113d3
Change font on shop tab titles
2020-03-17 20:32:18 +01:00
Matt-Yorkley
26688409a1
Use alternate dots in <ul> display
2020-03-17 20:32:18 +01:00
Matt-Yorkley
0893d14025
Add new shop link colours
2020-03-17 20:32:18 +01:00
Matt-Yorkley
efd314e3b1
Restyle contact tab
2020-03-17 20:23:45 +01:00
Matt-Yorkley
45cf54408d
Readjust layout after rebase
2020-03-17 20:23:45 +01:00
Matt-Yorkley
35133f7ee8
Adjust height of ordercycle selector on desktop
2020-03-17 20:23:45 +01:00
Matt-Yorkley
5becbc2a11
Move caret svg to /app/assets/images
2020-03-17 20:23:45 +01:00
Matt-Yorkley
390d80f0eb
Update order cycle selector positioning
2020-03-17 20:23:45 +01:00
Matt-Yorkley
6da43850d1
Restyle order cycle dropdown
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a146bdacc8
Realign ordercycle text on tablet downwards
2020-03-17 20:23:45 +01:00
Matt-Yorkley
43cadb00c4
Recolour order cycle selector
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a4b94cf39f
Add dividing line on tabs
...
Shows a thin grey line when the tab view content is white, but doesn't interfere when the content below is a full-width colour image.
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a35f3c130e
Recolour shop tab buttons
2020-03-17 20:23:45 +01:00
Matt-Yorkley
a93243a8b7
Change vertical position of shop name in relation to logo
2020-03-17 20:23:45 +01:00
Matt-Yorkley
de4402457a
Improve layout and positioning on mobile and tablet
2020-03-17 20:23:45 +01:00
Matt-Yorkley
bf9f7309f7
Adapt style definitions to altered layout
2020-03-17 20:23:45 +01:00
Luis Ramos
da2598282b
Can be object or {}, it's what the injector is doing, not related to rabl any more
2020-03-17 15:51:26 +00:00
Luis Ramos
eccaaca907
Merge pull request #4930 from luisramos0/3-0-stable-mar6
...
Merge master into 3-0-stable
2020-03-17 14:49:30 +00:00
Luis Ramos
bd32510837
Merge pull request #4860 from mkllnk/3395-remove-unused-assets
...
3395 remove unused assets
2020-03-12 22:44:41 +00:00
Luis Ramos
5ce4fec68b
Add html to show the errors reported by devise 3 about password and password confirmation mismatch on user.errors[:password_confirmation] (instead of user.errors[:password])
2020-03-09 15:48:45 +00:00
Luis Ramos
0815068050
Merge branch 'master' into 3-0-stable-mar6
2020-03-06 09:20:03 +00:00
Luis Ramos
dad21a52b2
Merge pull request #4672 from luisramos0/stripe_sca_method
...
Add new Stripe payment method compatible with the new Stripe Payment Intents API
2020-03-02 17:19:05 +00:00
Luis Ramos
427d3b7641
Revert "Comment spree_paypal express in all.js temporarily"
...
This reverts commit 26ba37b117
2020-02-28 12:18:53 +01:00
Luis Ramos
bf47d34434
Merge branch 'master' into 3-0-merge-master
2020-02-28 09:52:01 +00:00
Luis Ramos
03c91dfac1
Merge pull request #4780 from luisramos0/bulk_prod_errors
...
Fix javascript logic that parses server errors in the bulk product edit page
2020-02-25 18:49:54 +00:00
Maikel Linke
8432dab142
Remove unused Javascript manifest
...
It reduces compilation from 25s to 24s.
2020-02-25 11:43:53 +11:00
Maikel Linke
0b0263a605
Remove unused stylesheet manifest
...
Compiling assets with application.css: 40s
Compiling assets without application.css: 25s
2020-02-25 11:43:39 +11:00
Maikel Linke
17ea2cd510
Clean up JS assets comments
2020-02-24 11:22:47 +11:00
Maikel Linke
325c427219
Remove style from pasted HTML in editor
2020-02-24 11:22:47 +11:00
Maikel Linke
a3e87d893a
Remove obsolete angular-sanitize
...
Our TextAngular module supplies that code.
2020-02-24 11:22:47 +11:00
Luis Ramos
26ba37b117
Comment spree_paypal express in all.js temporarily
2020-02-22 11:53:35 +00:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
Matt-Yorkley
6f62c2cf27
Fix SCSS import file error
2020-02-22 11:05:24 +00:00
luisramos0
4ca9a19d8a
Temporarily remove broken fontawesome and spree_paypal_express assets
2020-02-22 11:05:24 +00:00
Luis Ramos
a3a61967a8
Merge pull request #4621 from luisramos0/spree_backend_js
...
OFN without spree_backend 🎉
2020-02-22 10:24:50 +00:00
luisramos0
b3ac5d8f41
Improve code readability a little
2020-02-21 10:52:56 +00:00
luisramos0
4e84310d63
Add StripeSCA where StripeConnect is treated as an exception in the setting up of process of a payment method and subscriptions
...
Here we are copy pasting and adding stripe SCA because we are planning to delete the StripeConnect that will be replaced by the stripe sca implementation
2020-02-21 10:52:56 +00:00
luisramos0
c773cde191
Add admin payment template for stripe sca and respective js code to make it work
2020-02-21 10:52:29 +00:00
luisramos0
f691d1aafd
Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses
2020-02-21 10:52:29 +00:00
Luis Ramos
1803ea3c38
Add traling breakline to case where errors come in a array
2020-02-20 10:06:10 +00:00
Luis Ramos
d99cba3b6e
Merge pull request #4709 from mkllnk/4172-js-pluralize
...
Pluralize common variant unit names
2020-02-19 22:28:54 +00:00
