Skip to content

fix: LEAP-1494: Padding in new textarea is missing in LSO #6496

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

Merged
merged 8 commits into from
Oct 15, 2024
Merged

fix: LEAP-1494: Padding in new textarea is missing in LSO #6496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ac7d005
fix: LEAP-1494: Padding in new textarea is missing in LSO
ricardoantoniocm Oct 9, 2024
c66cca0
Merge branch 'develop' into 'fb-leap-1494/padding-in-new-textarea-is-…
ricardoantoniocm Oct 9, 2024
15beedb
Adds fallback value for border-radius.
ricardoantoniocm Oct 9, 2024
368e43d
include layout in shared lib
bmartel Oct 9, 2024
e5f0693
Reverts addition of fallback variables now that the expected tokens w…
ricardoantoniocm Oct 10, 2024
fbce288
improve the import path to shared SCSS tokens
bmartel Oct 11, 2024
44c9aea
make the import even better
bmartel Oct 11, 2024
5fe7b2d
make the import even better
bmartel Oct 11, 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
2 changes: 1 addition & 1 deletion web/apps/labelstudio/src/themes/default/colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
@import '../../../../../libs/ui/src/tokens/colors';
@import '@humansignal/ui/src/tokens/colors';
1 change: 1 addition & 0 deletions web/apps/labelstudio/src/themes/default/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import '@humansignal/ui/src/tokens/layout';
3 changes: 2 additions & 1 deletion web/apps/labelstudio/src/themes/default/variables.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
@import './colors';
@import './typography';
@import './layout';
@import './typography';
2 changes: 1 addition & 1 deletion web/libs/editor/src/regions/TextAreaRegion/TextAreaRegion.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@

textarea {
// the same as in .mark, its padding set to 0
padding: var(--spacing-small) var(--spacing-medium);
padding: var(--spacing-small) var(--spacing-medium);
}
}
}
11 changes: 11 additions & 0 deletions web/libs/ui/src/tokens/layout.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
:root {
--spacing-small-xx: 0.125rem;
--spacing-small-x: 0.25rem;
--spacing-small: 0.5rem;
--spacing-medium: 1rem;
--spacing-large: 1.5rem;
--spacing-large-x: 2rem;
--spacing-large-xx: 2.5rem;
--radius-xs: var(--spacing-small-x);
--radius-small: var(--spacing-small);
}
1 change: 1 addition & 0 deletions web/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ module.exports = composePlugins(
// Common dependencies across at least two sub-packages
react: path.resolve(__dirname, "node_modules/react"),
"react-dom": path.resolve(__dirname, "node_modules/react-dom"),
"@humansignal/ui": path.resolve(__dirname, "libs/ui"),
};

return merge(config, {
Expand Down
Loading