raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,175 Commits 18 Branches 452 Tags
276b94de5bd7bb971c25b4f64e6acda0b5691391
Commit Graph

310 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
457d5a6c83 Override some css classes, to have a beautiful trix editor toolbar buttons 
- buttons background are transparent (instead of blue)
 - buttons background on hovering are transparent (instead of green)
 - disabled buttons cursor is default (instead of pointer)
 2023-06-08 11:43:59 +02:00
David Cook
e2ba18f828 Set sentence case tab names in Ruby instead of CSS 
I chose .capitalize instead of .humanize, because the latter has extra features which may not be desired.
 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
d6cb483f0d Adjust color to the title of the page 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
d7f7ff7436 Remove background, border and adjust margin top 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
905220a055 Add new color: $color-8 #191c1d Near-black 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
b865d8c1c0 Copy/Paste file admin/shared/layout under admin_v3 folder 
+ prettier
 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
51f47fc351 Add border bottom when hovering or selected 
+ add some padding to separate those borders then
 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
1b4236640d Add border with box-shadow to menu and sub-menu 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
2057449dac Add new color: $color-7 #EFF1F2 Light grey 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
ba98039e95 Adjust color to orange when selected or hover 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
d51786ac9e Adjust font size for labels in menu 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
ccd7466ede No more white on labels but dark grey 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
b163d4a584 Remove background-color on menu 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
a4d3011e27 Add new color: $color-9 #2E3132 Dark Grey 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
dd48092728 Prettier file 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
5ee3550ebd Change case to Sentence case 
CSS property `capitalize` uppercase all first letter of each words.

I need to use a small trick with `::first-letter` selector
 2023-06-08 11:24:44 +02:00
Jean-Baptiste Bellet
eab46b67e3 Copy/Paste file admin/components/navigation under admin_v3 folder 
+ prettier
 2023-06-08 11:24:44 +02:00
David Cook
3ce48848f0 Prettify the rest 2023-06-07 14:23:57 +02:00
David Cook
548a6f8d2e Prettify app/webpacker/css/admin/plugins/ 2023-06-07 14:23:57 +02:00
David Cook
10c52959ad Prettify app/webpacker/css/admin/hacks/ 2023-06-07 14:23:57 +02:00
David Cook
08dc3e3cbe Prettify more admin css 
yarn prettier --write
 2023-06-07 14:23:02 +02:00
Filipe
12159edaca Merge pull request #10833 from Matt-Yorkley/order-angular 
Remove Angular from admin orders index page
 2023-06-01 13:57:39 +01:00
Matt-Yorkley
1128fd9c02 Visual tweak to ship/capture buttons and success feedback 2023-06-01 12:13:12 +01:00
Filipe
2d4d8e26f5 Merge pull request #10875 from jibees/10561-allow-user-to-create-custom-tab-in-shop-navigation 
[White Label] Allow user to create custom tab in shop navigation
 2023-06-01 07:21:25 +01:00
David Cook
14345ef1fa Change warning orange to Mojo 
> That way we only have one orangy/red colour and we start simplifying things.
 2023-05-26 15:11:23 +10:00
David Cook
0df7c45a61 Change warning red to Mojo 
Some templates still had this colour hardcoded. They are using angular so I didn't spend time updating them.
 2023-05-26 15:11:23 +10:00
David Cook
dcf857cafb Move warning colour definition to CSS 
This also changes the orange to red, but that's part of the plan.
 2023-05-26 15:11:23 +10:00
David Cook
e674c53535 Change error red color to Mojo 
color-5 is used for error messages.
 2023-05-26 15:11:23 +10:00
David Cook
719a704985 Change blue colour as per design 
https://github.com/openfoodfoundation/openfoodnetwork/issues/10630#issue-1644928392
 2023-05-26 15:11:23 +10:00
David Cook
60ec24b92b Use variables for spree-blue 
Aka 'Havelock Blue', which is going to be changing.
 2023-05-26 15:11:23 +10:00
David Cook
e928e74ae6 Use different palette for admin styles v3 
Note that mail.css is still referring to the old palette.
 2023-05-26 15:10:49 +10:00
David Cook
01b3901b08 Add admin_style_v3 
Individual files may be copied in order to replace the old files.

NOTE: these may need manually re-syncing. If any of the copied files have changed on master in the meantime, we'll need to manaully review to consider bringing those changes to the new design.
 2023-05-26 15:10:27 +10:00
David Cook
9051318147 Move colour palette to new file 
This seemed like a good separation which will probably help with the upcoming changes.

Co-authored-by: jibees <jb.bellet@gmail.com>
 2023-05-26 15:09:59 +10:00
Jean-Baptiste Bellet
f961548da2 Deactivate file upload for trix editor 
Source: https://benborgers.com/posts/trix-disable-files
 2023-05-25 09:19:51 +02:00
Jean-Baptiste Bellet
bb6b1e59f9 Use tabs_and_panels_controller.js instead of PageSelectionCtrl 
Prefer StimulusJS over Angular
 2023-05-25 09:19:51 +02:00
Matt-Yorkley
dcdcdb4fc0 Align filter buttons centrally 2023-05-21 00:15:32 +01:00
Matt-Yorkley
be1ed2bbcf Update tomselect multiselect styling 2023-05-21 00:15:32 +01:00
Matt-Yorkley
d64a9afece Replace angular ofn-with-tip directive on capture/ship buttons 2023-05-21 00:15:32 +01:00
Matt-Yorkley
71c4f2a5be Update styling on multiselect tabs for tom-select 2023-05-21 00:15:32 +01:00
Matt-Yorkley
048df6230b Remove angular from admin orders index page 2023-05-21 00:15:32 +01:00
Filipe
0d23b63bbd Merge pull request #10779 from dacook/10634-remove-admin_style_v2 
10634 Remove admin_style_v2 feature
 2023-05-17 15:37:05 +01:00
Gaetan Craig-Riou
74a8730f04 Highlight voucher on order summary step 2023-05-15 13:42:38 +10:00
Gaetan Craig-Riou
e487ed0532 Add link to remove voucher when a voucher has been applied 
Improve styling to match the design
 2023-05-15 13:42:37 +10:00
Gaetan Craig-Riou
f7ee01b9f8 Add voucher input on checkout payment's step 
Voucher input is displayed  only if the distributor has any voucher
 2023-05-15 13:42:37 +10:00
David Cook
3ec659d82b Revert pull #10025 
[WIP 🚧 ] Admin, behind feature toggle admin_style_v2: adjust some colors

This reverts commits 60f0a58508ce77666fa96c73d76dc0620f23daaf~1..09bcc772ff089f911a56bb
 2023-05-09 21:26:47 +10:00
David Cook
be70cd7893 Revert pull #10054 
[WIP 🚧 ] Admin/Orders, behind feature toggle admin_style_v2: adjust colors

This reverts commits 5cab0f7f3d495daaeb97fd786208a24355b630fe..4ef5609b0eb08fe7e48803de166ae3e979103c1b
 2023-05-09 21:26:47 +10:00
David Cook
0ff540e1e3 Revert pull #10080 
[WIP 🚧 ] Admin - Order edition, behind feature toggle admin_style_v2: adjust colors

This reverts commits faf106b2824f248812f523c10b688bd9b254dc14..74b618230ff736ac7929246e2c83ed95067a4dd0
 2023-05-09 21:25:29 +10:00
David Cook
c21ff075de Revert pull #10131 
[WIP 🚧 ] /admin/order_cycles behind feature toggle admin_style_v2

This reverts commits ccfc632149f062fca546784c7c2f14708d91a08e~1..e403a2c174def34cfa115eab038c86923482bfbf
 2023-05-09 21:24:25 +10:00
David Cook
e11518938f Prettify admin components scss 
Largely whitespace, but some other updates too, including uppercase colour codes and standardising numbers.

Best viewed with whitespace ignored.
 2023-05-03 12:10:58 +10:00
David Cook
c4dc5e0718 Prettier: use double quotes by default 
Unfortunately Prettier won't let you do one rule at a time (https://stackoverflow.com/q/63813336/421243), so I'll break it into file chunks.
 2023-05-03 12:10:58 +10:00