raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-17 00:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,105 Commits 15 Branches 453 Tags
2defc4afa749b97cb29490ea31c8c28d6e00bde3
Commit Graph

269 Commits

Author SHA1 Message Date
David Cook
2defc4afa7 Ensure form-actions content uses available space 
Using pre-defined colunms was a hacky short term solution, this way is more flexible.
 2024-01-09 12:34:05 +11:00
Rachel Arnould
edfd4277ac Merge pull request #11977 from drummer83/my_pr-11936 
Fixes minor styling issues of admin and admin v3 in the dashboard
 2024-01-03 10:47:56 +01:00
Maikel
63ce91d52a Merge pull request #11954 from mkllnk/delete-app 
Enterprise user can remove Connected Apps
 2024-01-03 11:17:26 +11:00
drummer83
ad508c36e5 Avoid overflow of enterprise list when only few enterprises present 2023-12-24 19:07:14 +01:00
drummer83
2ab3efe5de Adjust outline when focusing the overflowing enterprisie list (was red in Firefox) 2023-12-24 19:02:58 +01:00
David Cook
3319f38e6c Rename class to signal intent 
Because the HTML is changed, I had to also update the old stylesheet too.
 2023-12-23 15:46:15 +01:00
Gaetan Craig-Riou
1bb4a667da Move banner to orignal postion at the bottom of page 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
772c641611 Move banner up to not cover existing button 2023-12-22 13:20:14 +01:00
David Cook
041d74b7c2 Fix CSS selector 
These styles should only apply to the form-actions in the products form.
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
56b75ad9fb Per review, stream line the css 
Reuse existing css when possible, and use variable for z-index so its
easier to track usage of z-index
 2023-12-22 13:20:14 +01:00
Gaetan Craig-Riou
8e31e35d5d Add Tos banner on all admin pages 
Plus spec, this is tested on the dashboard page.
The banner will show if the user accepted_at is before the tos file
updated at time.
 2023-12-22 13:20:14 +01:00
Maikel Linke
fcb540a89f Improve readability by limiting text width 2023-12-20 15:29:28 +11:00
Maikel Linke
f758daadc0 Use common colours in old and new design 2023-12-15 16:21:43 +11:00
Maikel Linke
e1730f25d6 Show app connection state and update link 2023-12-15 12:34:40 +11:00
Maikel Linke
4eb273b06e Create ConnectedApp with a reflex 
I would have like to use a standard form to submit to the reflex but the
whole enterprise settings tab is in a form already and HTML doesn't
allow nested forms. While it does still work in browsers, it would have
added much more HTML to set up a form with a hidden input field instead
of just one additional data attribute.

The whole page is rendered by the controller again but the reflex root
attribute ensures that only parts of this tab are replaced. Otherwise
unsaved data on other tabs could be replaced and the page actually
becomes blank because AngularJS doesn't play well with the morph.
 2023-12-15 11:50:04 +11:00
Maikel Linke
ca7b02d3ee Add basic description of Discover Regen app 2023-12-15 11:50:04 +11:00
David Cook
0b4013dd11 Add dismiss button to flashes 
And updating the secondary button style to ensure it's always white background
 2023-12-06 10:12:17 +11:00
David Cook
7d299affd3 Move hiding logic to stimulus controller 
This ensures morphed flashes hide like other flashes (eg in bulk order actions). I wanted to write a spec to prove it, but Capybara doesn't support mocking setTimeout and I didn't want to use sleep.

I've made it optional because this controller is shared with the shop frontend ([supposedly](5ef34347a3), although angular seems to override it).
 2023-12-06 10:11:19 +11:00
David Cook
6bf418c4eb Fixup 2023-11-29 15:36:00 +11:00
David Cook
ccc0c17e04 Hide value of disabled input in popout 
I'm not sure if we want to do this on all fields, so just scoped it here for now.
 2023-11-29 15:36:00 +11:00
David Cook
aa792346fc Refactor 2023-11-29 15:18:23 +11:00
David Cook
88fe8dcbe0 Show changes on popout button 2023-11-28 10:44:34 +11:00
David Cook
4560e3728c Show popout on click or down key 
It looks like a select drop-down, so it can behave like one too.
 2023-11-28 10:44:34 +11:00
David Cook
735b5789cc [wip] Style on-hand button 
Had to update the form controller a little bit to handle buttons.

But arrow not showwing on focus.
Getting some weird SCSS behaviour here.. maybe I'm trying to be too clever.
 2023-11-28 10:44:34 +11:00
David Cook
d218565834 Style stock popout 2023-11-28 10:44:34 +11:00
David Cook
b7ac1f2696 Move specific style rule to where it belongs 
Also fixed it to line up properly. There's probably a better way to line it up but that's no my concern right now..
 2023-11-28 10:44:34 +11:00
Filipe
ed8fd41bec Merge pull request #11290 from cyrillefr/Orders_in_confirmation_state_cannot_be_completed_by_hub_or_shop 
Fix Orders in confirmation state cannot be completed by hub or shop
 2023-11-16 19:50:14 +00:00
cyrillefr
31cc0494c2 Icon for the new action 
- Similar to the actual capture action
 2023-10-29 22:05:34 +01:00
David Cook
04032e61e2 Prettier 2023-10-24 15:21:13 +11:00
David Cook
fdad45bb46 Rename 'modified' state to 'changed' 
This conveniently matches the terminology used in both JavaScript and ActiveModel::Dirty.
 2023-10-24 15:21:13 +11:00
Gaetan Craig-Riou
d2952d46a6 Add the highlighted version of the "ship" icon 2023-10-17 13:35:01 +11:00
David Cook
fee126d6e1 Style form error messages 
With an icon, and sentence case (upcase_first is similar to humanize, but simpler (https://dev.to/junko911/rails-helper-methods-to-change-the-form-of-strings-1h9c#upcase-first))
 2023-10-06 14:15:07 +02:00
David Cook
5e478b8a76 Vertically align non-input content in table rows 2023-10-06 14:15:07 +02:00
David Cook
836f5a1fb3 Remove unused withError class 
It added specificity but had no use.
I reviewed a couple of screens to make sure:
  - /admin/orders/Rx/customer
  - /admin/properties/new

I have to confess I don't know how Spree::Admin::BaseHelper is included, or where it's used.

Best viewed with whitespace ignored.
 2023-10-06 14:15:07 +02:00
David Cook
6d35b1ac71 Fix bulk form input styles 
'header' fields are meant to be bold, and the field backgrounds are meant to match the cell background colour.
 2023-10-04 13:40:36 +02:00
Rachel Arnould
15137caed2 Merge pull request #11509 from dacook/buu-editing-part3-11059 
[BUU] Bulk form editing features
 2023-09-20 19:27:05 +02:00
Jean-Baptiste Bellet
beba709827 Move buttons/input stuff into related file 
And adjust design for v3 style
 2023-09-15 10:47:44 +02:00
Jean-Baptiste Bellet
e3359dd240 Move text-angular rules into its own file 2023-09-15 10:47:44 +02:00
David Cook
8ff67aca41 Disable filters and sorting when form is modified 
Stimulus controllers aren't supposed to reach outside their own element (so we can't do this with targets). Perhaps the controller should be bigger to encompass more, but I wanted to see if I could avoid making a mega component that does everything. For now it seems appropriate just to pass a selector in.
Another option is to publish events on other controllers using Outlets, but I don't know if we need to go there just yet.
 2023-09-15 15:45:48 +10:00
David Cook
e047f49998 Make form actions float over sort controls. 2023-09-15 15:45:48 +10:00
David Cook
18e40bebd0 Mark modified fields 2023-09-15 15:45:45 +10:00
Jean-Baptiste Bellet
34dab4003d Create a mixin that include list of styles for trix editor + content 
Will be used elsewhere (in shopfront in particular)
 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
c402093081 Special case for unordered list in trix editor: should be overwritten 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
ca6d12e8ed Actually, used in the shopfront context, links are orange 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
a8a35318f5 Add horizontal rule to trix editor 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
f9bc00e5cd We used to use <p> to seperate block between them. now use <div> 
trix doesn't allow the use of `<p>` as block separator since it can not contain `<figure>`: use `<div>` and _emulate_ as `<p>` with margin bottom
 2023-09-04 15:46:54 +02:00
Jean-Baptiste Bellet
b6e047086a Update trixEditor rendering <a /> element: should be green 2023-09-04 15:46:54 +02:00
David Cook
451513ad04 Markup labels as.. labels 
This means you can click on the label name to select the field, and accessibility software can read the label name.  I was motivated to do this so that we could update the spec to use label text rather than IDs. But it seems we can't do that with tom-select.

I've updated the styles for all form labels (in admin_style_v3 toggle) to match the design.
 2023-08-25 17:19:46 +10:00
David Cook
37d1113e4c Align row headers with input contents 
Inputs add extra padding, so we add the same padding to the header. Using an opt-in class, because I think we won't want this on all columns.
 2023-08-22 11:40:58 +10:00
David Cook
8440c44a6f Remove unused style 2023-08-22 11:40:58 +10:00