Skip to content

Commit 08a56a1

Browse files
feat: OPTIC-1197: rearrange data manager tabs and toolbar (#6503)
Co-authored-by: carly-bartel <[email protected]> Co-authored-by: yyassi-heartex <[email protected]>
1 parent 0cb33a6 commit 08a56a1

File tree

9 files changed

+21
-7
lines changed

9 files changed

+21
-7
lines changed

Diff for: web/libs/datamanager/src/components/App/App.scss

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
padding: 12px 16px;
1010
background-color: var(--sand_0);
1111
justify-content: space-between;
12+
border-bottom: 1px solid var(--sand_300);
1213

1314
&_newUI {
1415
padding: 8px;

Diff for: web/libs/datamanager/src/components/Common/RadioGroup/RadioGroup.scss

+5-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
height: var(--height);
1010
border-radius: var(--radius);
1111
padding: var(--padding);
12-
background: linear-gradient(0deg, var(--black_5), var(--black_5)), #FFF;
12+
background: var(--sand_100);
1313
box-shadow: inset 0 1px 0 var(--black_5), inset 0 0 0 1px var(--black_5);
1414

1515
&__buttons {
@@ -43,6 +43,10 @@
4343
opacity: 0.3;
4444
cursor: not-allowed;
4545
}
46+
47+
& input{
48+
cursor: pointer;
49+
}
4650
}
4751

4852
&__input {

Diff for: web/libs/datamanager/src/components/Common/Resizer/Resizer.scss

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515

1616
&__handle {
1717
top: 0;
18-
left: 100%;
1918
height: 100%;
20-
padding: 0 5px;
2119
position: absolute;
2220
cursor: col-resize;
2321
z-index: 100;
22+
right: -12px;
23+
padding: 0 5px;
2424

2525
&::before {
2626
top: 0;

Diff for: web/libs/datamanager/src/components/Common/Tabs/Tabs.scss

+9
Original file line numberDiff line numberDiff line change
@@ -119,5 +119,14 @@
119119
display: flex;
120120
align-items: center;
121121
justify-content: flex-end;
122+
position: absolute;
123+
bottom: 0;
124+
z-index: 1000;
125+
width: 100%;
126+
right: 0;
127+
left: 0;
128+
background: var(--sand_200);
129+
border-top: 1px solid var(--sand_300);
130+
padding: .625rem 1rem;
122131
}
123132
}

Diff for: web/libs/datamanager/src/components/DataManager/DataManager.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ const switchInjector = inject(({ store }) => {
4545

4646
const ProjectSummary = summaryInjector((props) => {
4747
return (
48-
<Space size="large" style={{ paddingRight: "1em", color: "rgba(0,0,0,0.3)" }}>
48+
<Space size="large" style={{ paddingRight: "1em" }}>
4949
{props.cloudSync && (
5050
<Space size="small" style={{ fontSize: 12, fontWeight: 400, opacity: 0.8 }}>
5151
Storage sync

Diff for: web/libs/datamanager/src/components/DataManager/Toolbar/OrderButton.jsx

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ const injector = inject(({ store }) => {
1616
export const OrderButton = injector(({ size, ordering, view, ...rest }) => {
1717
return (
1818
<Space style={{ fontSize: 12 }}>
19-
Order
2019
<Button.Group collapsed {...rest}>
2120
<FieldsButton
2221
size={size}

Diff for: web/libs/datamanager/src/components/DataManager/Toolbar/RefreshButton.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export const RefreshButton = injector(({ store, needsDataFetch, projectFetch, si
1717
return (
1818
<Button
1919
size={size}
20-
look={needsDataFetch && "primary"}
20+
look={needsDataFetch}
2121
waiting={projectFetch}
2222
onClick={async () => {
2323
await store.fetchProject({ force: true, interaction: "refresh" });

Diff for: web/libs/datamanager/src/components/DataManager/Toolbar/instruments.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { RefreshButton } from "./RefreshButton";
1717
import { ViewToggle } from "./ViewToggle";
1818

1919
const style = {
20-
minWidth: "110px",
20+
minWidth: "80px",
2121
justifyContent: "space-between",
2222
};
2323

Diff for: web/libs/datamanager/src/components/MainView/DataView/Table.scss

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
overflow: hidden;
55
flex-direction: column;
66
background: var(--sand_0);
7+
margin-bottom: 2.5rem;
78
}
89

910
.no-results {

0 commit comments

Comments
 (0)