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.

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

feat: OPTIC-757: Label Studio App Redesign #5892

Merged
merged 46 commits into from
Jun 24, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
34f7ad2
app redesign color updates in editor and datamanager
carly-bartel May 16, 2024
2d55153
ci: Build frontend
robot-ci-heartex May 16, 2024
5f71e25
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel May 21, 2024
225aaf0
ci: Build frontend
robot-ci-heartex May 21, 2024
e9befd3
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel May 22, 2024
81c1d86
ci: Build frontend
robot-ci-heartex May 22, 2024
ff617c8
button fix
carly-bartel May 23, 2024
453a01a
style fixes
carly-bartel May 23, 2024
82f6b8d
button fix
carly-bartel May 23, 2024
502e091
data manager style edits
carly-bartel May 23, 2024
c9647e0
Merge branch 'fb-optic-757/app-redesign' of github.com:HumanSignal/la…
bmartel May 29, 2024
962daf3
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel May 29, 2024
ebd6c97
ci: Build frontend
robot-ci-heartex May 29, 2024
90722ac
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 3, 2024
f09ef0a
ci: Build frontend
robot-ci-heartex Jun 3, 2024
beee620
qa fixes
carly-bartel Jun 3, 2024
5ecc99c
ci: Build frontend
robot-ci-heartex Jun 3, 2024
cd91e43
data manager style updates
carly-bartel Jun 4, 2024
38dc403
ci: Build frontend
robot-ci-heartex Jun 4, 2024
56ddfbb
update favicon
carly-bartel Jun 5, 2024
aba903b
style fix
carly-bartel Jun 5, 2024
83cbce5
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 6, 2024
c729fde
ci: Build frontend
robot-ci-heartex Jun 6, 2024
d983ba5
remove roboto
carly-bartel Jun 6, 2024
f7316c8
ci: Build frontend
robot-ci-heartex Jun 6, 2024
ab359b0
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 13, 2024
50fabd7
ci: Build frontend
robot-ci-heartex Jun 13, 2024
0a27510
setting up oss locally
carly-bartel Jun 13, 2024
b797cab
ci: Build frontend
robot-ci-heartex Jun 13, 2024
8f9efa8
style fixes
carly-bartel Jun 13, 2024
4f660c5
bug bash fixes
carly-bartel Jun 13, 2024
62d4b0c
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 14, 2024
ffcac4b
ci: Build frontend
robot-ci-heartex Jun 14, 2024
1f2d5ae
style fixes
carly-bartel Jun 17, 2024
702d42a
style edits
carly-bartel Jun 17, 2024
1a8c3a7
importing fonts
carly-bartel Jun 17, 2024
3dfecb6
login screens
carly-bartel Jun 18, 2024
459e66d
style fixes
carly-bartel Jun 18, 2024
46133d0
style edits
carly-bartel Jun 18, 2024
f819dba
style changes
carly-bartel Jun 19, 2024
249db4a
style changes
carly-bartel Jun 19, 2024
00d85ad
style changes
carly-bartel Jun 20, 2024
403b537
style edits
carly-bartel Jun 20, 2024
18b4337
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 21, 2024
b404bd6
Merge remote-tracking branch 'origin/develop' into fb-optic-757/app-r…
bmartel Jun 24, 2024
ed8e662
linting
bmartel Jun 24, 2024
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
data manager style updates
  • Loading branch information
carly-bartel committed Jun 4, 2024
commit cd91e438f51a6cb82345d769c5fa56eb8147faf8
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
color $black_40

a
color #096DD9
color var(--grape_500)

&:hover
text-decoration underline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
stroke #898098

&:hover
background rgba(#096DD9, 0.05)
background var(--grape_0)

svg > path
stroke #1f1f1f
Expand Down
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/Menu/Menu.styl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
border-radius 3px
align-items center
box-sizing border-box
color rgba(0,0,0,0.6)
color var(--sand_600)
font-size 16px
font-family Roboto
white-space nowrap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
padding: 4px 20px
&__item
cursor: pointer
color: rgba(0,0,0,0.6)
color: var(--sand_600)
border-radius: 4px
padding: 2px 16px
flex-grow: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

// hack to change background of selected annotation in LSF inside DM
#label-studio-dm [class*=Annotations_annotation_selected]
background: #e3f1ff
background: var(--grape_0)
2 changes: 1 addition & 1 deletion web/libs/datamanager/src/components/Common/Menu/Menu.styl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
border-radius 3px
align-items center
box-sizing border-box
color rgba(0,0,0,0.6)
color var(--sand_600)
font-size 16px
font-family Roboto
white-space nowrap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@
.radio-group__input
cursor pointer
&_checked
color #096DD9
background #096DD914
border-color #096DD9
color var(--grape_500)
background var(--grape_0)
border-color var(--grape_500)
cursor default
.radio-group__input
cursor default
Expand Down
6 changes: 3 additions & 3 deletions web/libs/datamanager/src/components/Common/Table/Table.styl
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,18 @@
min-width fit-content
position relative
cursor pointer
background-color #fff
background-color var(--sand_0)

&_disabled,
&_loading
opacity 0.6
pointer-events none

&_even:not(&_selected)
background-color #fafafa
background-color var(--sand_100)

&_selected
background-color #e3f1ff
background-color var(--grape_0)

&:not(&_selected):hover
background-color var(--grape_0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,18 +56,18 @@
min-width fit-content
position relative
cursor pointer
background-color #fff
background-color var(--sand_0)

&_disabled,
&_loading
opacity 0.6
pointer-events none

&_even:not(&_selected)
background-color #fafafa
background-color var(--sand_100)

&_selected
background-color #e3f1ff
background-color var(--grape_0)

&:not(&_selected):hover
background-color var(--grape_0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
font-size 12px
line-height 16px
letter-spacing 0.5px
color #096DD9
color var(--grape_500)
cursor initial
padding 16px 12px 8px
height var(--compact-height)
Expand All @@ -25,7 +25,7 @@
font-size 12px
&:hover
background-color transparent !important
color #096DD9 !important
color var(--grape_500) !important
&_isSeparator
cursor initial
height 1px
Expand All @@ -44,7 +44,7 @@
font-size 16px

&_hasSubMenu
color rgba(0,0,0,0.6)
color var(--sand_600)
&:hover
color #000
background-color rgba(0,0,0,0.04)
Expand Down Expand Up @@ -73,7 +73,7 @@
height auto
color #1F1F1F
&.actionButton_isTitle
color #096DD9
color var(--grape_500)
&_look_danger
color #d00
&:not(.dm-menu__item_active):hover
Expand All @@ -88,7 +88,7 @@
color #1F1F1F
background-color transparent
.actionButton__titleContainer:hover
background-color rgba(9, 109, 217, 0.12)
background-color var(--grape_0)
&__titleContainer
height 100%
width 100%
Expand Down
2 changes: 1 addition & 1 deletion web/libs/editor/src/common/Menu/Menu.styl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
border-radius 3px
align-items center
box-sizing border-box
color rgba(0,0,0,0.6)
color var(--sand_600)
font-size 16px
font-family Roboto
white-space nowrap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
gap 8px
flex: 1 0 auto;
.annotation-button__userpic_prediction
background-color #EFDBFF
color #7735D6
background-color var(--plum_100)
color var(--plum_500)
&__name
font-size 12px
font-weight 400
Expand All @@ -51,8 +51,8 @@
color #898098

&:hover
background-color rgba(9, 109, 217, 0.12)
border-color rgba(9, 109, 217, 0.16)
background-color var(--grape_0)
border-color var(--grape_100)
border-bottom-color transparent

.annotation-button__name
Expand Down Expand Up @@ -96,8 +96,8 @@
color #898098
visibility hidden
&:hover
color #096DD9
background rgba(9, 109, 217, 0.12)
color var(--grape_500)
background var(--grape_0)
&__picSection
position relative
&__status
Expand All @@ -124,15 +124,15 @@
&_contextMenuOpen
.annotation-button
&__ellipsisIcon
color #096DD9
background #096DD91F
color var(--grape_500)
background var(--grape_0)

.AnnotationButtonContextMenu
border-radius 4px
box-shadow: 0px 1px 3px 1px #26262626, 0px 1px 2px 0px #2626264D;
&__seperator
height 1px
background-color rgba(137, 128, 152, 0.12)
background-color var(--sand_100)
&__option
display flex
margin 8px
Expand All @@ -143,11 +143,11 @@
font-size 16px
font-weight 400
line-height 24px
letter-spacing 0.5px
border-radius 4px
padding-right 32px
&:hover
background-color rgba(65, 60, 74, 0.08)
background-color var(--grape_0)
color var(--grape_500)
&_duplicate
padding-top 6px
padding-bottom 6px
Expand All @@ -158,7 +158,11 @@
&_delete
padding-top 6px
padding-bottom 6px
color #CF1322
color var(--danger_color)
&:hover
background-color var(--red_1)
color var(--danger_color)
&_delete
.AnnotationButtonContextMenu__icon
display flex
padding 4px 11px 4px 12px
Expand Down
6 changes: 3 additions & 3 deletions web/libs/editor/src/components/Comments/CommentForm.styl
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.comment-form
--primary-action-color #00A8FF
--primary-action-color var(--grape_500)
--primary-action-padding 4px
--primary-action-border-radius 4px
--primary-action-surface-color-hover rgba(9, 109, 217, 0.12)
--primary-action-surface-color-hover var(--grape_0)
--text-input-min-height 40px
--tooltip-text-color #F5222D
--tooltip-text-color var(--danger_color)

display grid
grid-template-columns: auto var(--text-input-min-height);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
.relations
.info
.comments-panel
--details-section-border-color #E1E0E0
--details-section-border-color var(--sand_300)
width: 100%

&__section-tab
width: 100%

&-head
font-family "Roboto", Arial, sans-serif;
font-weight 500;
font-size 15px

Expand All @@ -31,7 +30,7 @@
justify-content space-between

span
opacity 0.6
color var(--sand_600)
font-weight normal

.region-actions
Expand Down
10 changes: 5 additions & 5 deletions web/libs/editor/src/components/SidePanels/PanelBase.styl
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
background var(--header-background-new)
color var(--icon-color)
&:hover
--icon-color #096DD9
--header-background-new #d8e7f9
--icon-color var(--grape_500)
--header-background-new var(--grape_0)

&.panel
&_alignment
Expand Down Expand Up @@ -83,8 +83,8 @@
margin 0

&:hover
--icon-color #096DD9
--header-background rgba(#096DD9, 0.16)
--icon-color var(--grape_500)
--header-background var(--grape_0)

&__header
top 0
Expand Down Expand Up @@ -134,7 +134,7 @@
display block

&:hover
background-color rgba(#096DD9, 0.16)
background-color var(--grape_0)

&:not(&_detached)&_hidden &__toggle
pointer-events none
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.tabs-panel
--header-height 24px
--header-border-radius 0
--header-background #e1e0e2
--icon-color #898098
--header-background var(--sand_200)
--icon-color var(--sand_500)

height 100%
z-index 10
Expand All @@ -13,8 +13,8 @@
padding 4px

&:hover
--icon-color #096DD9
--header-background #d8e7f9
--icon-color var(--grape_500)
--header-background var(--grape_0)

&__header-right,
&__header-left
Expand Down Expand Up @@ -54,7 +54,7 @@
margin 0

&:hover
--icon-color #096DD9
--icon-color var(--grape_500)
--header-background #d8e5f5

&__shield
Expand Down
2 changes: 1 addition & 1 deletion web/libs/editor/src/components/TopBar/Annotations.styl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
&__entity
&_selected
pointer-events none
background-color #e3f1ff
background-color var(--grape_0)

&__user
font-size 14px
Expand Down
2 changes: 1 addition & 1 deletion web/libs/editor/src/components/TopBar/TopBar.styl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

&__button
&:hover
background-color rgba(9, 109, 217, 0.12)
background-color var(--grape_0)

&__group
display flex
Expand Down
Loading