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
28,472 Commits 20 Branches 451 Tags
dea2adc3d64cd3839c996bd5d83475dfa12ffdcc
Commit Graph

325 Commits

Author SHA1 Message Date
Jean-Baptiste Bellet
3b68674896 Remove new_products_page and all associated controller/components/ 
new_products_page` is dead, long live `admin_style_v3` !
 2023-08-10 10:02:45 +02:00
David Cook
293e135a45 Move variables to one variables file 
Note that color-tbl-border is not needed in the new admin_v3 styles.
 2023-08-03 09:49:29 +10:00
David Cook
0aa4c144b9 Rename disabled button variable 
TIL that underscores and dashes are treated the same in SCSS variables.
 2023-08-03 09:49:29 +10:00
David Cook
1a02e108a5 Use red colour from the palette 
It's very similar.
 2023-08-03 09:49:29 +10:00
David Cook
9610281ed3 Rename variables 2023-08-03 09:49:29 +10:00
David Cook
b46e6c462d Rename table border variable 
There are other vars named brd, but I think border is clearer and doesn't need to be abreviated here.
 2023-08-03 09:49:29 +10:00
David Cook
c4a335548a Rename warning color variable 
To match the others in the variables file.

Also `warning-orange` was unused.
 2023-08-03 09:49:29 +10:00
David Cook
01a9095121 Move some variables to the palette 2023-08-03 09:49:29 +10:00
David Cook
2f801d346d Prettify some more css files 2023-08-03 09:49:29 +10:00
David Cook
14e07e38d3 Remove depdenency on darkswarm/mixins 2023-08-03 09:49:29 +10:00
David Cook
bf9cd09462 Remove dependence on darkswarm variables 
There were all sorts of dependencies hiding in there, and it was overwriting some of the admin variables. Better to keep things separate and simple.

I discovered that there was one legitimate reason for importing them though: for styling the trix editor. I can't think of a good way to safely import them without affecting the other variables, so I just hardcoded the colours for now.
 2023-08-03 09:47:44 +10:00
David Cook
9207724779 Copy legacy variables 
I'd like to go through and remove these, but it will have to happen another day.
 2023-08-03 09:47:44 +10:00
David Cook
828df3ed82 Consistently use red in forms 
Errors and required fields now use the colour from the palette. The error messages in the old design are a bit darker now, but I think it's clearer. And it makes the new design look way better.

Also snuck in a tiny padding tweak.
 2023-08-03 09:47:44 +10:00
Jean-Baptiste Bellet
a179c006fc Default design for ul and ol into the custom tab 
`ul` and `old` default design already been reset, reactivate default design only for `.custom-tab`
 2023-07-27 11:53:47 +02:00
Jean-Baptiste Bellet
4485490b0b Customize rendering inside the trix-editor, to match the shopfront rendering 2023-07-27 11:53:47 +02:00
Jean-Baptiste Bellet
352cf2ff71 Import typography.scss for admin_v3 
And do not apply `a` style to `.button` element.

ie.
```
a:not(.button)
```
 2023-07-25 14:29:00 +02:00
Jean-Baptiste Bellet
b42dfb574b Delete already imported (and modified) file 2023-07-19 14:58:40 +02:00
Jean-Baptiste Bellet
010f19cb83 Create a medium height button, and adjust #sort row 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
5a8a187f54 Add clear search button and action 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
904c7bfacf Buttons design 
Remove already defined `$border-radius`

Defined `app/webpacker/css/admin/globals/variables.scss`

Adjust height
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
7b56cbf3d4 Add labels to selectors, and adjust css 
+ Adjusting filter elements with flex-grow properties
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
f58cf2d3b2 Can filter by producer 
Not sur the request nor the `producers` in the reflex should be like this. This is a proof of concept, and should probably be reviewed

Fix linter issues
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
762b777995 Design of the search button 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
9d52f0b20a Loading spinner should be above content (filters, sort, ...) 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
643897abb2 Add search functionnality 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
574adb88d2 Add a per page component 
This is still a WIP.
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
3b61508652 Be more specific to only apply to the first container, ie. the root one 
+ Override default position (relative) in order to have loading above
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
47f21cb59e Add pagination with pagy 
For `admin_style_v3` use `<` and `>` for next and previous link

instead of `next` and `previous` string

Extract a mixin for a default box-shadow

Maybe this needs to be redefined. Let's see how next things goes.

When a table is followed by a pagination, remove its margin-bottom + border

Finally, design the pagination component

Add sorting/pagination module, on top of table

We use `cablea_ready.replace`, so need to add `#products-content` id

Use a `pagy` partial with reflex action, instead of the legacy one

- revert the legacy one to its previous state
 - in reflex, fetch product with page attribute, 1 by default

Move `pagy` into `admin/shared/v3/` to be reusable

+ use fontawesome icons for next and previous page

Remove useless line
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
69cff85577 Change color to EFF1F2 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
9b92c25879 Add a section for specific rules for both admin-menu and sub-menu 
+ change height for border bottom on selected/hovered menu
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
9762819aa8 Use the right color 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
1f3d41972f Add same padding than #admin-menu,#sub-menu li a in order to align 
content (header, navigation, content) on both left and right
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
2892301336 Factorize menu and submenu into same definition 
as they are the same, expect the font-size
 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
24c045a09c Reduce padding 2023-07-19 14:58:39 +02:00
Jean-Baptiste Bellet
a8088ae231 Create a pseudo element to add a line under the menu item 
- Increase top menu underline height to 3px
 - reduce underline width to same width of label
 2023-07-19 14:58:39 +02:00
Filipe
308ce9263d Merge pull request #11170 from jibees/11160-bulk-actions-function-not-working-on-safari-mac-browser 
Admin, Orders: Make bulk actions dropdown re-enabled for Safari browser
 2023-07-13 17:17:18 +01:00
Filipe
448d5ea017 Merge pull request #11135 from Matt-Yorkley/vouchers 
Vouchers part 2
 2023-07-13 12:50:32 +01:00
Jean-Baptiste Bellet
6143f4ce6f Use dropdown controller to manager actions dropdown in orders page 2023-07-11 10:48:52 +02:00
Matt-Yorkley
42a3087cdb Remove :available_on attribute from Product class 2023-07-06 14:36:35 +01:00
Matt-Yorkley
f7912a2240 Fix CSS/layout issues 2023-07-04 13:13:05 +01:00
David Cook
f280881126 Style tables with relaxed and condensed rows 
* attempt with shadows, but they are between every row: http://jsfiddle.net/d872e3nb/
 * another attempt at applying styles to tbody groups http://jsfiddle.net/sb38cLdu/
 2023-06-28 09:59:57 +10:00
David Cook
9c573f823a Move .content under main content div 
The .content div provides overall page margins and a max width, and is already nested inside the nav menus (this allows the nav background to fill the full width of the page.
The main content area should be structured the same way, so we can have flexibility needed to allow some screens to use the full page.

This doesn't seem to change the layout of any screens in the admin interface.

Now the table content can stretch full width
 2023-06-28 09:59:57 +10:00
David Cook
6a2025b271 Add products table 
With ellipsis clipping for long lines.
 2023-06-28 09:59:57 +10:00
David Cook
809c15b197 Load products page with reflex 
We will add the products in the next commit.
 2023-06-28 09:59:57 +10:00
David Cook
efcaab5deb Rename colour variables 2023-06-28 09:59:57 +10:00
Filipe
748cdaaa52 Merge pull request #10963 from jibees/10956-orders-page-uncaught-error-missing-target-element-tooltip-for-tooltip-controller 
Admin, Orders list: add tooltip on Edit action icon + capitalize tooltip (instead of uppercasing)
 2023-06-27 09:58:34 +01:00
Maikel
a7915b8089 Merge pull request #10849 from mkllnk/report-cable 
Show "loading" screen for background reports and display when ready
 2023-06-26 10:25:48 +10:00
Jean-Baptiste Bellet
7ce3c3f447 Overide a text-transform: uppercase to capitalize 
Inherit comes from `app/webpacker/css/admin/components/buttons.scss`
 2023-06-22 14:15:43 +02:00
Jean-Baptiste Bellet
d2534d6645 Be more specific via !important than the default button rule 
This one should override the default one
 2023-06-21 15:01:14 +02:00
Jean-Baptiste Bellet
7d9018c590 Instead of overriding css rules, prefer to not select rules for trix buttons 2023-06-21 15:01:14 +02:00