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

fix: OPTIC-1107: [timebox] visual inconsistency with datamanager on smaller screens #6379

Closed
wants to merge 7 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 label_studio/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<meta charset="utf-8"/>
<meta name="author" content="Label Studio"/>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<meta name="viewport" content="width=device-width, initial-scale=0.9, shrink-to-fit=no">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">

<!-- Address string color -->
<meta name="theme-color" content="#272727"> <!-- Chrome, Firefox OS and Opera -->
Expand Down
4 changes: 4 additions & 0 deletions web/apps/labelstudio/src/app/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ body {

margin: 0;
font-family: Figtree, sans-serif;
display: flex;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This possibly breaks the other pages, as flex would not be the default layout for body.

:global(.login_page_new_ui), :global(.app-wrapper) {
flex: 1;
}
}

.app-wrapper {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure this is actually applying to anything - anyone against removing this block?

Expand Down
8 changes: 7 additions & 1 deletion web/apps/labelstudio/src/pages/Projects/Projects.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
box-sizing: border-box;
grid-gap: 32px;
grid-auto-rows: 1fr;
grid-template-columns: repeat(4, 1fr);
grid-template-columns: repeat(1, 1fr);
}

&__link {
Expand All @@ -41,6 +41,12 @@
box-sizing: border-box;
}

@media (width >= 780px) {
&__list {
grid-template-columns: repeat(2, 1fr);
}
}

@media (width >= 1200px) {
&__list {
grid-template-columns: repeat(3, 1fr);
Expand Down
11 changes: 0 additions & 11 deletions web/libs/datamanager/src/components/App/App.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,6 @@
background-color: #f0f0f0;
}

.tab-panel {
display: flex;
padding: 12px 16px;
background-color: var(--sand_0);
justify-content: space-between;

&_newUI {
padding: 8px;
}
}

.grid {
flex: 1;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
padding: 12px 16px;
background-color: var(--white);
justify-content: space-between;
gap: 12px;

&_newUI {
padding: 8px;
Expand Down
Loading