Kristina Lim
34adf7cf6c
Lower the start point for sliding of modals
...
Occasionally, the page scrolls up while the modal is being opened. This
was causing the final position of the modal to be at the wrong location
relative to the viewport.
This was happening because of a race condition between the animation
that slides the modal from above the viewport to the middle, and focus()
which the modal does:
https://github.com/yalabot/angular-foundation/blob/0.8.0/src/modal/modal.js#L109
The final vertical position of the modal is at 10%, so the animation
which translates the modal -25% vertically was starting -15% above the
viewport. The focus() was then causing vertical scroll.
This lowers the starting point of the animation, so there will no longer
be scrolling.
Additionally, the animation would only happen on large screens. The CSS
property "top" is 0 for smaller screens.
2018-09-05 23:58:25 +08:00
Kristina Lim
6e55e5b1c7
Use maximum of 80% for modals in large screens
...
When there is enough content in the modal, the height of the modal plus
its top margin could exceed the height of the viewport.
Considering a top position of 10%, a max height of 80% renders a tall
modal vertically centered, with 10% remaining space at the bottom.
2018-09-05 23:58:22 +08:00
luisramos0
138fa41b8d
Fetched latest translations from transifex with tx pull --force
2018-09-05 14:02:51 +01:00
Pau Pérez Fabregat
0a05e6944e
Merge pull request #2625 from kristinalim/translations-rename_entreprise_keys_to_enterprise
...
Rename "entreprise" in i18n keys to "enterprise"
2018-09-05 13:23:02 +02:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
luisramos0
89d51d75ae
Merge branch 'master' into 2-0-stable-sept
2018-09-04 17:43:20 +01:00
Maikel
0d2fa3dc40
Merge pull request #2611 from luisramos0/cookies_banner_font_size
...
[Cookies] Increased cookies banner font size for med/large screens to improve readability
2018-09-04 11:35:32 +10:00
Maikel
1b6bb72966
Merge pull request #2587 from luisramos0/spree2_order_mailer_decorator_bug
...
Spree 2 Upgrade - MailMethod - Fixed bug on order_mailer_decorator (only visible in spree 2)
2018-09-04 11:29:51 +10:00
luisramos0
d29a1ebf9a
Updated spree 2-0-4 revision used
2018-09-04 00:41:29 +01:00
Kristina Lim
ce0758d420
Add confirm dialog for enterprise image removal
2018-09-04 02:08:26 +08:00
Kristina Lim
368612cad6
Allow removal of enterprise logo and promo image
2018-09-04 02:08:25 +08:00
Kristina Lim
c9370672c6
Add JS support for removal of enterprise images
2018-09-04 02:08:12 +08:00
Kristina Lim
9c3bb863da
Add endpoints for removing enterprise images
2018-09-04 01:32:39 +08:00
Kristina Lim
01d4b8fb10
Allow custom resource permission for admin controllers
2018-09-04 01:18:48 +08:00
Kristina Lim
f30032eee7
Include image URLs in serialized enterprise for admin
2018-09-04 01:18:45 +08:00
VadLusk
8efbe0e6d2
Delete _split2.css from application.rb assets precompile array.
2018-09-03 11:08:38 -06:00
Pau Pérez Fabregat
7dbbc3e9d8
Merge pull request #2610 from luisramos0/cookies_banner_bug
...
[Cookies] Added new test to cookies spec to cover bug on cookies banner and fix…
2018-09-03 17:23:17 +02:00
apoc64
fbce828305
Breaks comment into multiple lines
2018-09-03 08:56:42 -06:00
Pau Pérez Fabregat
903d70090e
Merge pull request #2636 from luisramos0/heroku_dead_code
...
Removed old files that were used with, now unsupported, heroku
2018-09-03 12:49:19 +02:00
Pau Pérez Fabregat
0f118baa4e
Merge pull request #2615 from mkllnk/2575-variant-on-hand-api
...
2575 variant on hand api
2018-09-03 11:16:02 +02:00
luisramos0
8004abbb9f
Improved Order mailer and Subscriptions mailer specs by removing dependency to old mail method
2018-09-03 10:03:06 +01:00
luisramos0
921c8dfdf4
Removed unnecessary cancel_email from order_email_decorator (spree one is equivalent after ofn PR#2589). Also refactored remaining order_mailer_decorator methods by extracting duplicated code.
2018-09-03 10:03:02 +01:00
luisramos0
14d526efc2
removed assets related to spree store: dead code
2018-09-03 09:50:42 +01:00
Maikel
129e2c915e
Merge pull request #2579 from openfoodfoundation/dependabot/bundler/angular-rails-templates-0.3.0
...
Bump angular-rails-templates from 0.2.0 to 0.3.0
2018-09-03 14:39:21 +10:00
Maikel
1b264403e0
Merge pull request #2624 from kristinalim/fix-no_order_link_in_subscription_emails_unless_user
...
Subscription emails for customer should not link to order page if customer has no user account
2018-09-03 14:38:56 +10:00
Maikel
3fadd06dc7
Merge pull request #2613 from luisramos0/cookies_better_policy_page
...
[Cookies] Updated cookies policy page text
2018-09-03 11:49:14 +10:00
Maikel
42afd426d5
Merge pull request #2620 from openfoodfoundation/dependabot/bundler/foreigner-1.7.4
...
Bump foreigner from 1.6.1 to 1.7.4
2018-09-03 11:48:48 +10:00
Maikel
11ab875b9a
Merge pull request #2623 from openfoodfoundation/dependabot/bundler/eventmachine-1.2.7
...
Bump eventmachine from 1.2.3 to 1.2.7
2018-09-03 11:48:34 +10:00
Maikel
c510bbd8d0
Merge pull request #2589 from luisramos0/spree2_base_mailer_dec_update
...
Spree 2 Upgrade - MailMethod - Delete outdated base_mailer_decorator.from_address
2018-09-03 11:05:48 +10:00
VadLusk
f74a6e47d5
Remove css_splitter references, delete all_split2.css. #1361 #2633
2018-09-03 09:20:26 +10:00
luisramos0
512577768c
Removed old files that were used with, now unsuported, heroku
2018-09-02 22:13:42 +01:00
apoc64
e62a755ddb
Adds comments for setting up timezone in application.yml
2018-09-02 11:08:27 -06:00
luisramos0
59f8dd4458
Improved cookies spec by keeping global config values as they were before the test
2018-09-01 20:35:07 +01:00
Kristina Lim
f844236b9c
Remove order link in non-user order cancellation email
2018-09-01 23:46:12 +08:00
Kristina Lim
5f2c3a1955
Remove order link in non-user failed payment email
2018-09-01 23:46:12 +08:00
Kristina Lim
f8244a400a
Custom subscription placement email if non-user
...
The order link should not be provided if the order does not have an
associated user account.
2018-09-01 23:46:11 +08:00
Kristina Lim
ad8b120e48
Extract format for order cycle closing in emails
...
Using a helper for this, but this can be changed to look up a
translation key.
2018-09-01 23:46:08 +08:00
Matt-Yorkley
9d05e5c97a
Remove duplicate line in spec
2018-09-01 14:09:07 +01:00
Kristina Lim
dc4037474d
Test order links in subscription placement emails
2018-09-01 15:40:36 +08:00
Matt-Yorkley
d8bbcdc54b
Decrease batch size to reduce chance of timeouts
2018-08-31 22:52:44 +01:00
Matt-Yorkley
4dfbbd60d4
Fix occasional StaleObjectError on variant updates
2018-08-31 19:47:08 +01:00
dependabot[bot]
4557bfbc17
[Security] Bump rubyzip from 1.2.1 to 1.2.2
...
Bumps [rubyzip](https://github.com/rubyzip/rubyzip ) from 1.2.1 to 1.2.2. **This update includes security fixes.**
- [Release notes](https://github.com/rubyzip/rubyzip/releases )
- [Changelog](https://github.com/rubyzip/rubyzip/blob/master/Changelog.md )
- [Commits](https://github.com/rubyzip/rubyzip/compare/v1.2.1...v1.2.2 )
Signed-off-by: dependabot[bot] <support@dependabot.com >
2018-08-31 17:49:12 +00:00
Matt-Yorkley
75a9ea5bfa
Prefer .flat_map(&foo) over .map(&foo).flatten
2018-08-31 15:38:38 +01:00
Matt-Yorkley
04d50d4555
Fix filter results bug in validation section
2018-08-31 15:00:29 +01:00
Kristina Lim
f5c44ef0e6
Rename "entreprise" in i18n keys to "enterprise"
2018-08-31 15:26:30 +08:00
Maikel
a9c8c033c7
Merge pull request #2566 from openfoodfoundation/dependabot/bundler/daemons-1.2.6
...
Bump daemons from 1.2.2 to 1.2.6
2018-08-31 14:54:53 +10:00
Maikel
c30e29051a
Merge pull request #2594 from openfoodfoundation/dependabot/bundler/compass-rails-3.1.0
...
Bump compass-rails from 2.0.4 to 3.1.0
2018-08-31 13:47:22 +10:00
Maikel
42936be40a
Merge pull request #2578 from luisramos0/spree2_fix_test_line_items
...
Spree2 fix test line items
2018-08-31 13:26:25 +10:00
Maikel Linke
13b9ecab21
Fix font issue in mobile menu
2018-08-31 11:23:11 +10:00
luisramos0
1b4e0cd73a
Made the menu config default values more user friendly
2018-08-31 11:23:11 +10:00
