raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,451 Commits 20 Branches 451 Tags
d7f7ff74367fb378bfece316b2efb2e651fa41e0
Commit Graph

168 Commits

Author SHA1 Message Date
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
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
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
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
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
Konrad
d115c4ce2c Merge pull request #10733 from jibees/9782-shops-list-overlapping-and-overflowing-texts-on-mobile2 
Shops list: fix some overlapping and overflowing texts on mobile
 2023-05-02 12:15:19 +02:00
Matt-Yorkley
b9431cd121 Remove data-hook attributes 2023-04-28 13:03:13 +01:00
Jean-Baptiste Bellet
9584205a8e Use .flex class in utilities.scss file 
No need to have multiple definition as already included
 2023-04-26 09:51:28 +02:00
Jean-Baptiste Bellet
3644dbc0fd Small fix of a prettier formatter error 2023-04-26 09:51:17 +02:00
Jean-Baptiste Bellet
05a7276c9c Create an utilities.scss file that contains some utility classes 
Finally Tailwind is coming? ;)
 2023-04-26 09:47:23 +02:00
Jean-Baptiste Bellet
76357789a3 Avoid line break between state wording and its little colored circle 2023-04-20 09:09:29 +02:00
Jean-Baptiste Bellet
5dd7246b85 Rename confirm to use confirmation 
`confirmation` is the state used by order model
 2023-04-20 09:07:01 +02:00
David Cook
29b9777a96 Replace deprecated sass division operator 
https://sass-lang.com/documentation/breaking-changes/slash-div
> Sass currently treats / as a division operation in some contexts and a separator in others. This makes it difficult for Sass users to tell what any given / will mean, and makes it hard to work with new CSS features that use / as a separator.

There's a handy migrator:

    npm install -g sass-migrator
    sass-migrator division **/*.scss

And it cleverly avoids the need for the ugly division method in most cases.
 2023-04-14 17:59:01 +10:00
David Cook
283dd84ad6 Add expected whitespace 
The migrator refused to proceed until I fixed this.
 2023-04-14 17:56:24 +10:00
Jean-Baptiste Bellet
d9eb97bd05 As we are in transition, angularjs dropdown component use both css classes 
And we should specify a bit the height of the component since it's used in different context
 2023-02-14 16:15:44 +01:00
Jean-Baptiste Bellet
6ec219031d Avoid to specifically use a label component for menu_item 
Then, add `label` CSS rule inside `menu_item` component
 2023-02-14 15:47:55 +01:00
Konrad
c4b89e466b Merge pull request #9804 from jibees/9420-resend-confirmation-email-in-bulk 
Admin, Orders list: Resend confirmation email in bulk
 2023-01-11 00:16:57 +01:00
Jean-Baptiste Bellet
e403a2c174 Secondary button can actually be disabled 2023-01-06 14:03:40 +01:00
Jean-Baptiste Bellet
5aca76e520 OC, incoming|outgoing products, have the actions inside the table 2023-01-06 14:03:40 +01:00
Jean-Baptiste Bellet
73a2b90e1b On hovering, all the tr should be colored 
This needs to be respecified with an `!important` keyword

Even if already defined in `app/webpacker/css/admin/openfoodnetwork.scss`
 2023-01-06 14:03:40 +01:00
Jean-Baptiste Bellet
52cb6d4eec Put all actions in the same flex container, aligned to right 2023-01-06 10:45:30 +01:00
Jean-Baptiste Bellet
fc6bd53720 Put some specials rules for listing_orders as generics for all tables 
- `.actions` is now integrated to the table itself, with the same design
- We have to use `!important` keyword as already defined like this...
 2023-01-06 10:33:27 +01:00
Jean-Baptiste Bellet
972e0b5d0b Specify color for h4. Same as others titles. 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
927c1c81e5 Border and background for a panel 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
fd87013a63 Colorize and customize tagging componenent 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
274e0d0335 Same color but with variable 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
c5f3d3fa71 Use a darker grey for disabled button 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
26684f7db5 New colors for wizard progress 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
2ccb7de004 Specify cursor: default when button is disabled 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
7c321922ad Actually, this needs to be white since the body is no more white 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
d7e3e81c8c Adjust border color when active 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
d7454ecb9f Adjust border radius when drop is above 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
4c172b5ace Adjust color and height between input type text and select 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
6529a8d98f #clear_all_filters button as a secondary one 2023-01-04 10:41:30 +01:00
Jean-Baptiste Bellet
9997fe26fc Small adjustments to make it usable in admin section 2023-01-03 10:32:11 +01:00