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
style edits
  • Loading branch information
carly-bartel committed Jun 20, 2024
commit 403b5372af0b73dd5fa6477b00c44ebb96429409
1 change: 1 addition & 0 deletions web/apps/labelstudio/src/assets/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@ export { ReactComponent as IconPredictions } from "./predictions.svg";
export { ReactComponent as IconEmptyPredictions } from "./empty-predictions.svg";
export { ReactComponent as IconSpark } from "./spark.svg";
export { ReactComponent as IconModel } from "./model.svg";
export { ReactComponent as IconModels } from "./models.svg";
18 changes: 18 additions & 0 deletions web/apps/labelstudio/src/assets/icons/models.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/assets/icons/upload.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/components/Badges/Enterprise.styl
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
display flex
gap 4px
align-items center
height 14px
height 18px

&_filled &__label
background none
Expand Down
6 changes: 3 additions & 3 deletions web/apps/labelstudio/src/components/Columns/Columns.styl
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
grid-column-gap var(--column-gap, 10px)

&__title
margin-bottom 32px
margin-bottom .5rem
font-weight 500
font-size 16px
font-size 1.125rem
line-height 22px
padding 0 16px 0 0
padding 0 1rem 0 0
14 changes: 7 additions & 7 deletions web/apps/labelstudio/src/components/Description/Description.styl
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
.description
font-size 16px
color var(--sand_700)
color var(--sand_600)
line-height: 140%

& a
color var(--primary_link)
color var(--grape_500)
text-decoration underline
&:hover
text-decoration none

&_size
&_small
font-size 12px
font-size .75rem

&_medium
font-size 16px
font-size .875rem

&_large
font-size 22px
font-size 1.125rem

&:not(&_noOffset)&_size
&_small
Expand All @@ -26,4 +26,4 @@
margin 32px 0

&_large
margin 40px 0
margin 40px 0
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@
font-weight: 500;
&:before{
background var(--sand_200)
top: -20px
}

~/_simple &
Expand Down
1 change: 1 addition & 0 deletions web/apps/labelstudio/src/components/Form/Form.styl
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

&:not(:first-child)
margin-top 12px
border-top 1px solid var(--sand_300)

&__submit
display flex
Expand Down
3 changes: 1 addition & 2 deletions web/apps/labelstudio/src/components/Menu/Menu.styl
Original file line number Diff line number Diff line change
Expand Up @@ -113,14 +113,13 @@
&_contextual &__item
height 32px
padding 16px 8px
margin 4px 8px
display flex
align-items center
justify-content space-between
border-radius 4px
cursor pointer
&:hover
background-color rgba(65, 60, 74, 0.08)
background-color var(--grape_0)
&_dangerous
color #CF1322
&:hover
Expand Down
10 changes: 8 additions & 2 deletions web/apps/labelstudio/src/components/Modal/Modal.styl
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,19 @@
text-align center
font-size 14px
line-height 22px
& a
color var(--primary_link)
text-decoration underline
&:hover
text-decoration none
color var(--primary_link)

&:not(&_bare)
background rgba(0, 0, 0, 0.03)
background var(--sand_100)
box-shadow inset 0px 1px 0px rgba(0, 0, 0, 0.05)

&__close
--button-color $accent_color
--button-color var(--primary_link)

&_fullscreen &__content
width calc(100vw - 80px)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ styled_scroll()
padding-left: 8px
font-weight: 500
border: none
color: #1890FF
color: var(--grape_500)
background: none
width: 100%
text-align: left
Expand Down Expand Up @@ -114,7 +114,7 @@ styled_scroll()
box-sizing: content-box
&_active
&:hover
box-shadow: 0px 0px 0 2px #1890ff
box-shadow: 0px 0px 0 2px var(--primary_link)
&:hover
opacity: 0.9

Expand All @@ -134,9 +134,11 @@ styled_scroll()
grid-column: 1 / span 2
padding: 16px 32px
font-size: 14px
background: rgba(0, 0, 0, 0.03)
background: var(--sand_100)
box-shadow: inset 0px 1px 0px rgba(0, 0, 0, 0.05)
text-align: center
& a
color var(--primary_link)
&__info-icon
margin-right: 8px
vertical-align: -5px
Expand Down
Loading
Loading