Pau Pérez Fabregat
8946fe3ce8
Merge pull request #2829 from Matt-Yorkley/bi/results_per_page
...
Add per_page controls to admin orders index
2018-10-15 12:17:39 +02:00
Pau Pérez Fabregat
fe149967e4
Merge pull request #2521 from luisramos0/cookies_in_engine
...
[OFN Domains] Breaking OFN into domains - POC cookies inside an engine
2018-10-15 10:03:30 +02:00
Matt-Yorkley
dafcd0ddc2
Add per_page controls to admin orders index
2018-10-10 18:32:12 +01:00
Pau Pérez Fabregat
58a99a7f89
Merge pull request #2692 from Matt-Yorkley/bi/angular_orders
...
Angularise orders page
2018-10-04 21:10:48 +02:00
Matt-Yorkley
017e3d14df
Use variable colour assignment
2018-10-02 11:10:21 +01:00
Matt-Yorkley
b57c6cf9ac
Add errors when attempting to update non-updatable fields
2018-09-19 21:12:29 +01:00
Matt-Yorkley
68f0c80016
Add loading message and spinner
2018-09-19 13:00:30 +01:00
Matt-Yorkley
3b9d9db16b
Add pagination
2018-09-19 13:00:29 +01:00
luisramos0
dc5eb6448e
Change web/all.css from sprockets to SASS and include web/all.css through darkswarm/all.css
2018-09-17 16:05:38 +01:00
luisramos0
d170a4d489
New domain Web (rails engine) with the following features extracted from the main app:
...
- cookies banner
- cookies policy page
- cookies policy and privacy policy links in the footer
2018-09-17 16:05:32 +01:00
Pau Pérez Fabregat
0520f2187c
Merge pull request #2540 from luisramos0/delete_dead_store
...
removed assets related to spree store: dead code
2018-09-17 11:33:56 +02:00
Maikel
065df96872
Merge pull request #2675 from Matt-Yorkley/bi/remake_views
...
Remake orders index view
2018-09-13 12:29:54 +10:00
luisramos0
409f084bd4
Added matomo opt out iframe to cookies policy page
2018-09-12 18:30:24 +01:00
Pau Pérez Fabregat
e474271698
Merge pull request #2637 from Vadlusk/remove_css_splitter
...
Remove duplicate css_splitter references, delete split css file.
2018-09-12 13:07:15 +02:00
Matt-Yorkley
f08d6389d8
Apply capture order override
2018-09-11 12:06:58 +01:00
Kristina Lim
339ea6fa91
Clean up SCSS as suggested by scss-lint
2018-09-06 04:21:35 +10:00
Kristina Lim
9258e8c464
Remove height limit for modals in small screens
2018-09-05 23:58:26 +08:00
Kristina Lim
169aa752d8
Enlarge potential size of modals for large screens
...
Change modals for large screens from 10% position from top and 80% max
height, to 5% position from top and 90% max height.
This is to accommodate the taller cookies policy modal.
It seems that it is not easy to apply a custom position and height to a
specific modal only. This doesn't seem to be supported by the modal
library currently being used.
Before the recent changes, most modals were rendering at 10px top
position (not the originally planned 10%), so changing this to 5%
doesn't seem to be much of a compromise.
2018-09-05 23:58:26 +08:00
Kristina Lim
f4725198e8
Move some CSS to pages/ subdirectory.
2018-09-05 23:58:26 +08:00
Kristina Lim
f03eb02269
Keep height of modal, dialog within screen height
2018-09-05 23:58:25 +08:00
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
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
luisramos0
14d526efc2
removed assets related to spree store: dead code
2018-09-03 09:50:42 +01:00
VadLusk
f74a6e47d5
Remove css_splitter references, delete all_split2.css. #1361 #2633
2018-09-03 09:20:26 +10:00
luisramos0
02b968b312
Cookies policy page table has a single column now. Also made small updates to the page text, migrated translations to ruby translations and extracted repeated partial from cookies policy page view
2018-08-30 00:27:35 +01:00
luisramos0
53e7fcb019
Imcreased cookies banner font size for med/large screens to improve readability
2018-08-30 00:21:00 +01:00
Maikel Linke
c9862535f8
Import required colour definitions in SCSS
...
This avoids asset compile errors like this one:
Sass::SyntaxError: Undefined variable: "$disabled-light".
2018-08-14 10:01:48 +10:00
luisramos0
8681618490
Fixed CodeClimate scss feedback on cookies banner and policy page css
2018-08-14 10:01:48 +10:00
luisramos0
1c20967ca4
Added a button to close the cookies policy page at the bottom of the page to improve UX on mobile
2018-08-14 10:01:48 +10:00
luisramos0
92f9cbd00a
Added new cookies banner (with link to cookie policy page and the accept cookies button)
2018-08-14 10:01:48 +10:00
luisramos0
08c5d8f3ab
Added new cookies policy page and added a link to it in the footer (cookies policy link)
2018-08-14 10:01:48 +10:00
luisramos0
362ed8ed08
Changed modals max height from 120% to 100% so that the content in the modal is never outside the viewport
2018-08-14 10:01:48 +10:00
Kristina Lim
6251c72921
Add divider between admin enterprise index actions
2018-08-10 12:17:31 +10:00
Maikel
03468efa7e
Merge pull request #2346 from oeoeaio/subs-totals
...
Subs: totals in backend are consistent and include fee breakdown
2018-08-07 18:17:13 +10:00
Maikel Linke
b736560d63
Inform about inaccurate subscription totals
...
https://github.com/openfoodfoundation/openfoodnetwork/pull/2346#issuecomment-409822038
2018-08-03 14:59:27 +10:00
Matt-Yorkley
c8397024e4
Streamline Product Import UX flow
2018-08-03 14:33:35 +10:00
Matt-Yorkley
ae5fd864d1
Fix embedded shopfront menu responsiveness
2018-07-25 17:41:26 +10:00
Margaret Williford
512e974672
move width setting for tagline logo image from HTML to CSS
2018-07-20 14:00:06 +10:00
Margaret Williford
d952276e2a
move footer logo sizing from html to css
2018-07-20 14:00:06 +10:00
Maikel
23964b2542
Merge pull request #2422 from luisramos0/1667_email_validation_fix
...
1667 manage validations emails
2018-07-20 12:19:23 +10:00
luisramos0
8246893652
Added notice for unexpected mail in confirmation instructions mail (HugsDaniel)
2018-07-19 09:26:29 +10:00
Matt-Yorkley
e3162b0a14
Change import method to fix missing variable error on asset precompilation
2018-07-18 23:00:50 +01:00
Matt-Yorkley
456e05d5d2
Include subfolders in scss import
2018-07-18 22:56:10 +01:00
Matt-Yorkley
24ff5555be
Create admin SCSS colour palette
2018-07-18 22:56:10 +01:00
Matt-Yorkley
75e52a7a91
CSS tweaks fo guest flag
2018-07-18 22:56:10 +01:00
Matt-Yorkley
583f16b38d
Add guest label to admin customers index
2018-07-18 22:56:10 +01:00
Matt-Yorkley
c4af50e95c
Add sidebar to Import index page
2018-07-15 23:12:26 +01:00
Maikel Linke
60b66540df
Add resend email button to admin user form
...
Fixes https://github.com/openfoodfoundation/openfoodnetwork/issues/1589
2018-07-13 09:04:41 +10:00
Rob Harrington
c496d0f14d
Allow credit owed on payments made via stripe to be refunded via the admin section
2018-07-03 14:21:58 +10:00
