Skip to content

featt; DIA-2175: [TEMP] New button #7524

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.

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

Open
wants to merge 151 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
151 commits
Select commit Hold shift + click to select a range
fec2717
Button WIP - Primary variant
nick-skriabin Apr 7, 2025
c88048b
Merge branch 'develop' into fb-dia-2142/button
nick-skriabin Apr 7, 2025
06c4a65
Finalize styles and variants
nick-skriabin Apr 8, 2025
32f8e7d
Merge branch 'develop' into fb-dia-2142/button
nick-skriabin Apr 8, 2025
4e6efca
Add `buttonVariant` helper function
nick-skriabin Apr 8, 2025
6933415
Proper link
nick-skriabin Apr 8, 2025
bac4542
Fix link preview
nick-skriabin Apr 8, 2025
f444aae
Add Button to export list, organize exports
nick-skriabin Apr 8, 2025
6f05af0
Start using new Button
nick-skriabin Apr 8, 2025
ebfe4ca
Remove text shadow from outlined button
nick-skriabin Apr 8, 2025
92741b6
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 8, 2025
04f0e5d
Homepage fix button usage
nick-skriabin Apr 8, 2025
895f542
Replace "Create" button
nick-skriabin Apr 8, 2025
46c88a4
Add sizes and fix some UI bugs
nick-skriabin Apr 8, 2025
5d0b0e3
Fix button label paddings
nick-skriabin Apr 8, 2025
5db2fa7
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 8, 2025
4b9844f
Update buttons
nick-skriabin Apr 8, 2025
399348d
Fix sizing options
nick-skriabin Apr 8, 2025
22c1b82
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 8, 2025
7aaa0d9
Update DM buttons
nick-skriabin Apr 8, 2025
c626a96
Fix hover
nick-skriabin Apr 8, 2025
34101a6
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 8, 2025
aec08ca
Update buttons in project settings
nick-skriabin Apr 8, 2025
25f3e89
Update css formatting
nick-skriabin Apr 9, 2025
b2ef92c
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 9, 2025
30196a0
Simplify button layout for complex scenarios
nick-skriabin Apr 9, 2025
4989ab9
Updating button layout
nick-skriabin Apr 9, 2025
8c2d00d
Icons alignment
nick-skriabin Apr 10, 2025
3ebc541
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 10, 2025
1b36a2b
Updating buttons
nick-skriabin Apr 10, 2025
13b2fc2
Fix button behavior when using outline/string look
nick-skriabin Apr 10, 2025
10236cd
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 10, 2025
8f2ea39
Update hover behavior for outline/string looks
nick-skriabin Apr 10, 2025
71bd710
Shadow behavior when focused/active
nick-skriabin Apr 10, 2025
51ed7a1
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 10, 2025
0a35a09
More buttons
nick-skriabin Apr 10, 2025
f4219d5
Merge branch 'develop' into fb-dia-2156/button
nick-skriabin Apr 10, 2025
abd6036
Use raw values instead of hardcoded ones
nick-skriabin Apr 10, 2025
5ab9930
Update color variable
nick-skriabin Apr 10, 2025
3d8242c
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 10, 2025
4a8198c
Remove LSO Button
nick-skriabin Apr 10, 2025
8ea5bc4
Replace buttons in Data Manager
nick-skriabin Apr 10, 2025
3b2b4a5
Update fonts
nick-skriabin Apr 10, 2025
6a2af80
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 10, 2025
998bb7a
Updating Editor buttons
nick-skriabin Apr 11, 2025
97d6126
Icon sizing
nick-skriabin Apr 11, 2025
69f2b79
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 11, 2025
dae281d
Update task navigation buttons
nick-skriabin Apr 11, 2025
d1f3a86
Smaller text size
nick-skriabin Apr 11, 2025
a64860b
Allow overriding `disabled` state when waiting
nick-skriabin Apr 11, 2025
1399ba2
Fix neutral button focus outline
nick-skriabin Apr 11, 2025
b117378
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 11, 2025
69cccf6
Updating native buttons
nick-skriabin Apr 11, 2025
95208f0
Fix Button usage in DM (caused error)
nick-skriabin Apr 11, 2025
92be19a
Add ButtonGroup
nick-skriabin Apr 11, 2025
bf59c57
Merge branch 'fb-dia-2156/button' into fb-dia-2142/new-button-lso
nick-skriabin Apr 11, 2025
416db50
Editor buttons
nick-skriabin Apr 14, 2025
4202c59
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin Apr 14, 2025
ca92603
Hotkeys
nick-skriabin Apr 14, 2025
1d20ca9
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin Apr 14, 2025
dff5fba
Fix config labels
nick-skriabin Apr 14, 2025
aa31234
Addressing CS feedback
nick-skriabin Apr 15, 2025
20745a3
Update color
nick-skriabin Apr 15, 2025
ceb70a4
Addressing feedback
nick-skriabin Apr 15, 2025
9c6fd3f
Remove traces
nick-skriabin Apr 15, 2025
ce536b1
Cleanup
nick-skriabin Apr 15, 2025
b62fb7c
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin Apr 16, 2025
5d780cf
Biome fixes
nick-skriabin Apr 16, 2025
44a3494
Update media controls
nick-skriabin Apr 16, 2025
0de319c
Fix tests
nick-skriabin Apr 16, 2025
a9db330
Update antd buttons (WIP)
nick-skriabin Apr 16, 2025
21cd3d2
Replace antd buttons
nick-skriabin Apr 16, 2025
32307de
Update the rest of the buttons
nick-skriabin Apr 16, 2025
50736db
Biome
nick-skriabin Apr 16, 2025
748d1d8
Fix relations test
nick-skriabin Apr 16, 2025
4fc0ba9
Fix e2e and integration tests
nick-skriabin Apr 16, 2025
404aff7
Fix selectors
nick-skriabin Apr 16, 2025
aaef2eb
Biome
nick-skriabin Apr 16, 2025
2537afe
Fix aria-labels
nick-skriabin Apr 16, 2025
3d07215
Fix selectors
nick-skriabin Apr 16, 2025
1f63d72
Fix selector
nick-skriabin Apr 17, 2025
6ca786e
One more selectors fix
nick-skriabin Apr 17, 2025
edb0765
Add proper aria-label to region delete button
nick-skriabin Apr 17, 2025
caef639
Restore "delete selected region" behavior
nick-skriabin Apr 17, 2025
e7f7624
Formatting
nick-skriabin Apr 22, 2025
39f67be
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin Apr 22, 2025
59d731a
Clarification on data-ignore-uikit
nick-skriabin Apr 22, 2025
97bf0be
Update buttons look
nick-skriabin Apr 22, 2025
3d3d5eb
Include libs in tailwind compilation process
nick-skriabin Apr 22, 2025
e53db07
Adjust styles
nick-skriabin Apr 24, 2025
bc1fd47
Fix button sizes
nick-skriabin Apr 24, 2025
a9b455d
Fix grid image preview buttons
nick-skriabin Apr 24, 2025
2f922ac
Fix save button in the API settings dialog
nick-skriabin Apr 24, 2025
384ad84
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin Apr 29, 2025
79bbf8c
Fix incorrect css
nick-skriabin Apr 29, 2025
b993913
Sync Follow Merge dependencies
MihajloHoma Apr 30, 2025
33a0f44
Merge branch 'develop' into 'fb-dia-2142/new-button-lso'
MihajloHoma Apr 30, 2025
0ca6140
Fix filter line and columns list
nick-skriabin Apr 30, 2025
f9cf88a
Sync Follow Merge dependencies
borisheartex May 5, 2025
3ebc678
Merge branch 'develop' into 'fb-dia-2142/new-button-lso'
borisheartex May 5, 2025
9bcac31
Fix button story, remove global shadcn export
nick-skriabin May 5, 2025
f68c932
Re-export Shadcn Badge
nick-skriabin May 5, 2025
cf6ae40
Add missing exports
nick-skriabin May 5, 2025
f39b772
Move button styles to tailwind class names
nick-skriabin May 6, 2025
ef86b76
Modal buttons
nick-skriabin May 6, 2025
30e3700
Update controls look
nick-skriabin May 7, 2025
189e2e5
Sync Follow Merge dependencies
borisheartex May 8, 2025
d2ad0ac
Merge branch 'develop' into 'fb-dia-2142/new-button-lso'
borisheartex May 8, 2025
7a2861c
Adjust icon size to button's size
nick-skriabin May 8, 2025
105f747
Limit min-width for icon containers
nick-skriabin May 8, 2025
902e0a7
Fix border color for active state
nick-skriabin May 9, 2025
4a33b39
UI polishing
nick-skriabin May 9, 2025
e0227fc
Fix filter button
nick-skriabin May 9, 2025
987cc27
Update button borders
nick-skriabin May 9, 2025
8000b9b
Sync Follow Merge dependencies
borisheartex May 12, 2025
959945b
Adding aria-label attributes
nick-skriabin May 12, 2025
eca8a8d
More aria-label
nick-skriabin May 12, 2025
7a64fce
Adding more aria-label attributes
nick-skriabin May 12, 2025
af6443d
Add aria-label attributes to various buttons for improved accessibility
nick-skriabin May 12, 2025
3fd6156
Add aria-label attributes to confirm and info buttons for enhanced ac…
nick-skriabin May 12, 2025
c233b11
Add aria-label attributes to buttons in Debug, Annotations, and Regio…
nick-skriabin May 12, 2025
9b23805
Update aria-label attributes for buttons in Debug, Annotations, Comme…
nick-skriabin May 12, 2025
3d8ec59
Some more aria-label
nick-skriabin May 12, 2025
4c6705e
Custom reject button styles
nick-skriabin May 13, 2025
5caaa61
Cancel skip styles
nick-skriabin May 13, 2025
922668e
Update go to import button
nick-skriabin May 13, 2025
f3d9a4a
Merge branch 'develop' into fb-dia-2142/new-button-lso
nick-skriabin May 13, 2025
9c70028
Add updated button component
nick-skriabin May 13, 2025
3f87a61
Sync Follow Merge dependencies
nick-skriabin May 13, 2025
d6a4d99
Merge branch 'develop' into 'fb-dia-2175/new-button-lse'
nick-skriabin May 13, 2025
e1f90ac
Use correct button component
nick-skriabin May 13, 2025
da9fe36
Update Account Page buttons
nick-skriabin May 13, 2025
e323a56
Add `cn` export
nick-skriabin May 13, 2025
4eb862b
Sync Follow Merge dependencies
borisheartex May 14, 2025
5cb822f
Merge branch 'develop' into 'fb-dia-2142/new-button-lso'
borisheartex May 14, 2025
4025947
Add waiting state to the button (useful for tests)
nick-skriabin May 14, 2025
48f9a37
Add waiting state to the button (useful for tests)
nick-skriabin May 14, 2025
ea00bdd
Add variant state
nick-skriabin May 14, 2025
ac8a3a3
Add variant state
nick-skriabin May 14, 2025
c39ec2f
Sync Follow Merge dependencies
borisheartex May 15, 2025
a84f900
Merge branch 'fb-dia-2142/new-button-lso' into fb-dia-2175/new-button…
nick-skriabin May 15, 2025
a509a54
Sync Follow Merge dependencies
borisheartex May 16, 2025
d3621d5
Restore aria-label for region actions
nick-skriabin May 16, 2025
7a5728b
Merge branch 'fb-dia-2142/new-button-lso' into fb-dia-2175/new-button…
nick-skriabin May 16, 2025
1478773
Fix grid preview buttons
nick-skriabin May 16, 2025
e5a47a5
Grid view buttons
nick-skriabin May 16, 2025
f6aa6dc
Larger icons
nick-skriabin May 16, 2025
e51ee29
Remove outline from region actions
nick-skriabin May 16, 2025
9e6d5e0
Gradient button
nick-skriabin May 16, 2025
d6650aa
Gradient button focused state
nick-skriabin May 16, 2025
7978e2d
Merge branch 'develop' into fb-dia-2175/new-button-lse
nick-skriabin May 20, 2025
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
17 changes: 16 additions & 1 deletion label_studio/core/static/css/login.css
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,20 @@ html, body {
font-family: 'Hellix', sans-serif;
}

.login_page_new_ui form .lsf-button-ls.lsf-button-ls_look_primary {
.login_page_new_ui form input {
padding: 10px 15px;
border-radius: 100px;
box-sizing: border-box;
border: 1px solid var(--sand_400);
}

.login_page_new_ui form button {
--button-color: var(--color-neutral-inverted-content);
border-radius: 4rem;
background: var(--sand_900);
color: white;
padding: 10px 0;
border: none;
background: var(--color-neutral-inverted-surface);
}

Expand Down Expand Up @@ -270,6 +281,10 @@ label{
display: block;
}

.login-button {
font-size: 16px;
}

.form-group {
display: block;
margin-bottom: .5rem;
Expand Down
250 changes: 250 additions & 0 deletions label_studio/core/static/css/uikit.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
body {
--border-color: rgba(0, 0, 0, 0.15);
--color-error: #d00;
}

.full_content {
padding: 20px;
}

.full_content > header {
font-size: 1.5em;
margin-bottom: 20px;
}

.field {
display: grid;
grid-template-columns: 92px auto;
align-items: center;
gap: 16px;
row-gap: 4px;
}

.field--wide {
display: block;
}

.field--wide > *:not(:first-child) {
display: block;
margin-top: 4px;
width: 100%;
box-sizing: border-box;
}

.field > * {
grid-column: 2;
}

.field > label {
grid-column: 1;
}

.field .actions {
display: flex;
gap: 10px;
}

.field.error {
background: unset;
}

.field.error input {
color: var(--color-error);
}

span.error {
background: unset;
color: var(--color-error);
}

/**
* [data-ignore-uikit] allows skip styling from this file
* uikit is a redundant legacy and it messes up the styles
* in a lot of places by using global styles for elements
* like inputs and buttonts. if your button looks weird, try
* adding data-ignore-uikit. most probably it will help
*/

input:not([data-ignore-uikit]),
textarea:not([data-ignore-uikit]) {
font: inherit;
}

a.button:not([data-ignore-uikit]),
input:not([data-ignore-uikit]),
textarea:not([data-ignore-uikit]) {
border: 1px solid var(--border-color);
padding: 9px 16px;
}

input[type=text][disabled]:not([data-ignore-uikit]) {
background: rgba(0, 0, 0, 0.03);
color: rgba(0, 0, 0, 0.4)
}

a.button:not([data-ignore-uikit]),
input[type=button]:not([data-ignore-uikit]),
input[type=submit]:not([data-ignore-uikit]),
input[type=reset]:not([data-ignore-uikit]) {
background: white;
border-radius: 5px;
/* min-width: 140px; */
text-align: center;
line-height: 1;
font-weight: 500;
color: #555;
cursor: pointer;
}

a.button:hover,
input[type=button]:hover,
input[type=submit]:hover,
input[type=reset]:hover {
filter: brightness(0.98);
}

a.button.primary,
input[type=button].primary,
input[type=submit].primary,
input[type=reset].primary {
background: #1890FF;
border: 1px solid #1890FF;
color: white;
}

input[type=button].danger,
input[type=submit].danger,
input[type=reset].danger {
color: var(--color-error);
}

input[type=button][disabled]:not([data-ignore-uikit]),
input[type=submit][disabled]:not([data-ignore-uikit]),
input[type=reset][disabled]:not([data-ignore-uikit]) {
background: rgba(0, 0, 0, 0.2);
border-color: transparent;
cursor: not-allowed;
}

ul.toggle {
display: flex;
justify-content: stretch;
list-style: none;
padding: 4px;
margin: 0;
background: rgba(0, 0, 0, 0.05);
box-shadow: inset 0px 1px 0px rgb(0 0 0 / 5%), inset 0px 0px 0px 1px rgb(0 0 0 / 5%);
border-radius: 8px;
font-weight: 500;
}

ul.toggle--big {
font-size: 16px;
}

ul.toggle--big li {
padding: 4px 20px;
}

ul.toggle li {
cursor: pointer;
color: rgba(0, 0, 0, 0.6);
border-radius: 4px;
padding: 2px 16px;
flex-grow: 1;
text-align: center;
}

ul.toggle li.active {
color: black;
background: white;
box-shadow: 0px 1px 0px rgb(0 0 0 / 10%), 0px 0px 0px 1px rgb(0 0 0 / 2%), 0px 5px 10px rgb(0 0 0 / 15%);
}


.userpic {
width: 28px;
height: 28px;
display: flex;
overflow: hidden;
position: relative;
align-items: center;
border-radius: 50%;
justify-content: center;
background: rgba(0, 0, 0, 0.04);
box-shadow: inset 0px 0px 0px 1px rgba(0, 0, 0, 0.1);

font-size: 12px;
font-weight: bold;
color: rgba(0, 0, 0, 0.4);
}

.userpic--medium {
width: 64px;
height: 64px;
font-size: 28px;
}

.userpic--big {
width: 92px;
height: 92px;
font-size: 32px;
}

.userpic--small {
width: 28px;
height: 28px;
font-size: 14px;
}

.userpic img {
width: 100%;
height: 100%;
object-fit: cover;
position: absolute;
left: 0;
top: 0;
}


/* file upload button */
.file-input {
border: none;
padding-left: 0;
overflow: hidden;
width: 100%;
}

.file-input::-webkit-file-upload-button {
visibility: hidden;
}

.file-input::before {
content: 'Choose file';
display: inline-block;
background: none;
border: 1px solid #CCC;
border-radius: 3px;
padding: 5px 8px;
outline: none;
white-space: nowrap;
-webkit-user-select: none;
cursor: pointer;
text-shadow: 1px 1px #fff;
font-weight: 400;
font-size: 1em;
}

.file-input:hover::before {
border-color: #333;
}

.file-input:active::before {
background: #e3e3e3;
}

.file-input:active {
border: none;
box-shadow: none;
outline: none;
}
2 changes: 1 addition & 1 deletion label_studio/users/templates/users/new-ui/user_login.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h2>Log in</h2>
<input type="checkbox" id="persist_session" name="persist_session" class="lsf-checkbox-ls" checked="checked" style="width: auto;" />
<label for="persist_session">Keep me logged in this browser</label>
</div>
<button type="submit" aria-label="Log In" class="lsf-button-ls lsf-button-ls_look_primary">Log in</button>
<button type="submit" aria-label="Log In" class="login-button">Log in</button>
</form>
</div>
{% if not settings.DISABLE_SIGNUP_WITHOUT_LINK %}
Expand Down
81 changes: 0 additions & 81 deletions web/apps/labelstudio/src/components/Button/Button.jsx

This file was deleted.

Loading
Loading