Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[admin] Add scopes and controller helpers for ui/table #5516

Merged
merged 14 commits into from
Nov 24, 2023
Merged

[admin] Add scopes and controller helpers for ui/table #5516

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
13ab92a
Don't add filter hidden inputs if not required in `ui/table`
elia Nov 23, 2023
12298c4
Don't change the cursor for disabled button
elia Nov 24, 2023
d7191a2
Fix the store url to always have an HTTP(S) protocol defined
elia Nov 24, 2023
6def880
Reorganize `ui/table` intializer
elia Nov 24, 2023
c09369a
Let the first render of `ui/table` already hide toolbars based on the…
elia Nov 24, 2023
bfae492
Reset `ui/table` filters when exiting clicking on "cancel" from searc…
elia Nov 24, 2023
cddacff
Extract common search patterns to a controller helper
elia Nov 24, 2023
1406dad
Add support for scopes to `ui/table`
elia Nov 24, 2023
c7f7af5
Add a state column to `orders/index`
elia Nov 24, 2023
9ad6bd6
Only hide `ui/table` cells overflow horizontally when wrapped
elia Nov 24, 2023
00d145e
Allow the `ui/tab` component to pick an arbitrary tag
elia Nov 24, 2023
ff3c195
Adjust the `ui/tab` colors so when disabled by a form submission they…
elia Nov 24, 2023
34faee9
Refactor `ui/table` to use the internal objects instead of proxy ivars
elia Nov 24, 2023
73b1ded
Use turbo-permanent in `ui/table` for navigating out of search mode
elia Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Don't change the cursor for disabled button 
Using not-allowed can be confusing when a button is disabled temporarily
while submitting a form.

Co-Authored-By: Rainer Dema <[email protected]>
  • Loading branch information
@elia @rainerdema
elia and rainerdema committed Nov 24, 2023
commit 12298c4c4feb49153338d419c65f011261503dc1
16 changes: 8 additions & 8 deletions admin/app/components/solidus_admin/ui/button/component.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,32 +34,32 @@ class SolidusAdmin::UI::Button::Component < SolidusAdmin::BaseComponent
hover:text-white hover:bg-gray-600
active:text-white active:bg-gray-800
focus:text-white focus:bg-gray-700
disabled:text-gray-400 disabled:bg-gray-100 disabled:cursor-not-allowed
aria-disabled:text-gray-400 aria-disabled:bg-gray-100 aria-disabled:aria-disabled:cursor-not-allowed
disabled:text-gray-400 disabled:bg-gray-100
aria-disabled:text-gray-400 aria-disabled:bg-gray-100
},
secondary: %{
text-gray-700 bg-white border border-1 border-gray-200
hover:bg-gray-50
active:bg-gray-100
focus:bg-gray-50
disabled:text-gray-300 disabled:bg-white disabled:cursor-not-allowed
aria-disabled:text-gray-300 aria-disabled:bg-white aria-disabled:cursor-not-allowed
disabled:text-gray-300 disabled:bg-white
aria-disabled:text-gray-300 aria-disabled:bg-white
},
danger: %{
text-red-500 bg-white border border-1 border-red-500
hover:bg-red-500 hover:border-red-600 hover:text-white
active:bg-red-600 active:border-red-700 active:text-white
focus:bg-red-50 focus:bg-red-500 focus:border-red-600 focus:text-white
disabled:text-red-300 disabled:bg-white disabled:border-red-200 disabled:cursor-not-allowed
aria-disabled:text-red-300 aria-disabled:bg-white aria-disabled:border-red-200 aria-disabled:cursor-not-allowed
disabled:text-red-300 disabled:bg-white disabled:border-red-200
aria-disabled:text-red-300 aria-disabled:bg-white aria-disabled:border-red-200
},
ghost: %{
text-gray-700 bg-transparent
hover:bg-gray-50
active:bg-gray-100
focus:bg-gray-50 focus:ring-gray-300 focus:ring-2
disabled:text-gray-300 disabled:bg-transparent disabled:border-gray-300 disabled:cursor-not-allowed
aria-disabled:text-gray-300 aria-disabled:bg-transparent aria-disabled:border-gray-300 aria-disabled:cursor-not-allowed
disabled:text-gray-300 disabled:bg-transparent disabled:border-gray-300
aria-disabled:text-gray-300 aria-disabled:bg-transparent aria-disabled:border-gray-300
},
}

Expand Down