Filipe
97b6289263
Merge pull request #12787 from rioug/move-variant-unit-attributes-to-variant
...
[Product Refactor] Move variant unit sizes to variant
2024-10-15 19:58:45 +01:00
Rachel Arnould
f54552f939
Merge pull request #12886 from rioug/12855-VINE-connected-app
...
[Citi OFN Voucher] Add VINE connected app
2024-10-14 15:32:09 +02:00
Gaetan Craig-Riou
a500c75ee9
Add stying for the unit pop out
2024-10-14 15:01:18 +11:00
Gaetan Craig-Riou
630c398b12
Move unit popout css to a partial
2024-10-14 15:01:18 +11:00
Rachel Arnould
f5baa42bfc
Merge pull request #12860 from chahmedejaz/bugfix/12852-fix-select2-choices-fixed-height
...
[BUU] Fix Display ordering in shopfront field to allow re-ordering of the sequence
2024-10-04 16:59:54 +02:00
Ahmed Ejaz
1550ca5da0
fix the choice drag issue
...
- disabled width on select2-search-choice-close so that it doesn't cover whole option
2024-09-27 16:57:35 +05:00
Cillian O'Ruanaidh
f474afaceb
Merge in latest :master and resolve conflict in app/models/enterprise.rb
2024-09-27 10:11:26 +01:00
Gaetan Craig-Riou
0824430da5
Add Vine connected app
...
The connection/disconnection logic is yet to be implemented
2024-09-24 10:43:55 +10:00
Ahmed Ejaz
35f9c420fd
12852: remove unnecessary !important
2024-09-14 18:04:52 +05:00
Ahmed Ejaz
052e3b6380
12852: add remove choice icon for select2
2024-09-14 17:42:10 +05:00
Ahmed Ejaz
1545708d4e
12852: remove fix height for the select2-choices
2024-09-14 17:18:09 +05:00
Gaetan Craig-Riou
3f6aaa74cc
Remove duplicated styling for tabs
...
It uses the same styling as #admin now share via mixins
2024-09-13 14:14:30 +10:00
Gaetan Craig-Riou
776b9fcdab
Re enable images partial import
2024-09-11 14:24:24 +10:00
Gaetan Craig-Riou
5bf6bdf7f0
Fix some display issue with long description
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
e8de76dc46
Add style for Shop
...
As before, move imported css to partials to avoid duplication. And use
mixin and variable to handle tooltip styling
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
55733555bf
Add style for Product details
...
Only import relevant css, which has been move to their own partial to
avoid duplication
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
f59ee96011
Copy foundation-sites css relevant to the modal
...
The frontend is based on fondation-sites to provide responsive design,
we can't just import in the backend. So opted for copying the part we
needed
2024-09-10 13:29:40 +10:00
Gaetan Craig-Riou
2b74bbd45d
Add styling for tabs
2024-09-10 13:29:40 +10:00
David Cook
5324747f89
Reduce cell padding
...
This is closer to the original design:
* 6px between inputs
* 6px vertical padding on condensed rows
* 12px vertical padding on relaxed rows
Note that 'relaxed' rows are now smaller than the regular rows, which was not the original intention. But we haven't got spare time to do a broader review of table styles right now.
2024-08-26 16:53:19 +10:00
Konrad
25b1620707
Merge pull request #12743 from wandji20/wb-OFN-12214
...
(Fix) chore(deps): bump wicked_pdf from 2.6.3 to 2.8.0 [OFN-12214]
2024-08-22 17:34:20 +02:00
Konrad
ae6182579b
Merge pull request #12762 from EdwardLi-coder/change_colour_of_complete_order
...
change colour of "complete order"
2024-08-18 15:08:46 +02:00
Konrad
503148b13b
Merge pull request #12653 from wandji20/wb-OFN-11613
...
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-14 18:14:33 +02:00
wandji20
7392079d4d
Move mail related styles to asset pipeline [OFN-12214]
2024-08-13 17:11:29 +01:00
EdwardLi-coder
93a6ff4b50
remove background-color
2024-08-13 09:38:20 +08:00
wandji20
a85cfab506
Remove awesome nested set gem and dependencies [OFN-11636]
2024-08-12 18:47:16 +01:00
wandji20
ea238829a8
Revert front end validation and implement backend validation for changes in datetime order cycle values [OFN-11613]
2024-08-12 09:05:48 +01:00
wandji20
0de8a90b14
Add warning modal to order cycle with attached schedule general setting form [OFN-11613]
2024-08-12 09:05:48 +01:00
EdwardLi-coder
97a72dfde7
change colour of "complete order"
2024-08-12 12:01:02 +08:00
Cillian O'Ruanaidh
a6d3909e95
Replace text-angular editor with trix editor in fields for shop messages and about fields for enterprises and enterprise groups
2024-08-09 10:37:23 +01:00
Filipe
fcb0996a76
Merge pull request #12713 from dacook/buu/style-fixes2
...
[BUU] Style fixes
2024-08-08 17:31:20 +01:00
Rachel Arnould
f51705cb57
Merge pull request #12676 from dacook/add-affiliate_sales_data-connected_app-12550
...
Add "Affiliate Sales Data" connected app option
2024-07-30 16:14:27 +02:00
David Cook
ec3c157f1e
Add gap between elements
...
It could be done better, but requires more code cleanup than it's worth.
2024-07-29 15:20:36 +10:00
David Cook
32aacbd2b0
Don't use fixed heights 🔥
...
Just don't. It makes life hard and doesn't solve the problem properly.
Now, when the content doesn't fit within the screen width, it will flow naturally and not jump up and down all over other elements.
2024-07-29 15:13:30 +10:00
David Cook
655dc92246
Clean up wacky input styles 🔥
...
Trying to style a pretend input just doesn't work in practice, it resulted in a couple of style issues.
Let's keep it simple,
2024-07-29 15:02:06 +10:00
Konrad
00a0006ff2
Merge pull request #12691 from ccozkan/use-vertical-transitions-for-cloning-and-deleting
...
Use vertical transitions for cloning and deleting products
2024-07-28 18:25:07 +02:00
David Cook
1742d2807f
Add affiliate sales data to form
2024-07-25 17:06:13 +10:00
Gaetan Craig-Riou
7f9bbd23e5
Revert fix introduced in https://github.com/openfoodfoundation/openfoodnetwork/issues/10685
...
It breaks wit Safari on Iphone
2024-07-22 14:59:30 +10:00
Çağrı Özkan
29d63b0f0f
Change slide in animation to appear from top
2024-07-22 06:01:01 +03:00
Çağrı Özkan
25e9fd22d8
Change slide out animation to disappear towards top
2024-07-22 06:01:01 +03:00
wandji20
8a8a178683
Fix Product description not correctly truncated [OFN-10685]
2024-07-08 10:04:16 +01:00
Ahmed Ejaz
5a259f1b91
Merge branch 'master' into task/11987-remove-SR-from-clone
2024-06-26 16:18:42 +05:00
Konrad
f9e1ff9238
Merge pull request #12567 from mkllnk/flash-css-fix-v3
...
Error messages don't block bottom of page clicks
2024-06-20 17:22:02 +02:00
David Cook
b8f8d6d042
Show/hide columns with CSS selectors instead
...
Well, that made the JS way simpler.
Adds a lot of classes though. Maybe we could do it based on column index instead, but this will do for now.
table.hide-col0 { td:nth-child(0) { display: none; } }
2024-06-18 15:35:53 +10:00
Ahmed Ejaz
30528cab0f
11987: add slide-in animation for product clone
2024-06-17 22:58:36 +05:00
Maikel Linke
81a8ee5a31
Error messages don't block bottom of page clicks
...
The flash container was set to 100% width to center the messages on the
screen. The messages were covering only part of the screen though. So
the container beyond the actual message box was covering part of the
page, blocking clicks on elements.
A new way of centering the container with CSS translate means that the
width of the container can be the same as the content, not covering
anyting accidentally.
And moving the whole container up instead of only moving the contained
message allows us to interact with elements below the flash message as
well.
2024-06-13 11:20:54 +10:00
David Cook
0190d6f31d
Update dropdown styles
...
The v2 dropdown is used in various places, and now looks more in line with the new design.
2024-06-13 10:08:02 +10:00
David Cook
8c75e6baa8
Make column selector a dropdown
...
With some styling tweaks.
2024-06-13 10:07:55 +10:00
David Cook
9ba3b4f2d5
Fix up styles
2024-06-12 14:58:09 +10:00
David Cook
c6452efa92
Isolate styles for their intended use
...
This also improves the styling of the orders action dropdowns (on index and edit pages). It adds the new chevron icon, but needed some fiddling to make it look right.
2024-06-12 14:58:09 +10:00
David Cook
e516e7f335
Tweak checkbox dropdown styles
...
Use the new design for checkboxes and fix alignment.
Removes redesigned-input, which is a small regression on the old design, but I think it's acceptable bcause we're going to shut it down soon.
2024-06-12 14:58:09 +10:00
