Skip to content

Commit 850fd3e

Browse files
bexsoftBenjamin Perez
andauthored
Changed buttons & search boxes styles (#318)
Co-authored-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent 6d8f1c4 commit 850fd3e

File tree

15 files changed

+200
-213
lines changed

15 files changed

+200
-213
lines changed

portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ import { AppState } from "../../../../store";
3535
import { connect } from "react-redux";
3636
import { logMessageReceived, logResetMessages } from "../../Logs/actions";
3737
import { addBucketOpen, addBucketReset } from "../actions";
38-
import { containerForHeader } from "../../Common/FormComponents/common/styleLibrary";
38+
import {
39+
actionsTray,
40+
containerForHeader,
41+
searchField,
42+
} from "../../Common/FormComponents/common/styleLibrary";
3943
import PageHeader from "../../Common/PageHeader/PageHeader";
4044

4145
const styles = (theme: Theme) =>
@@ -68,18 +72,8 @@ const styles = (theme: Theme) =>
6872
},
6973
},
7074
},
71-
actionsTray: {
72-
textAlign: "right",
73-
"& button": {
74-
marginLeft: 10,
75-
},
76-
},
77-
searchField: {
78-
background: "#FFFFFF",
79-
padding: 12,
80-
borderRadius: 5,
81-
boxShadow: "0px 3px 6px #00000012",
82-
},
75+
...actionsTray,
76+
...searchField,
8377
...containerForHeader(theme.spacing(4)),
8478
});
8579

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ import { CreateIcon } from "../../.././../../../icons";
3030
import { niceBytes } from "../../../../../../common/utils";
3131
import Moment from "react-moment";
3232
import DeleteObject from "./DeleteObject";
33-
import { containerForHeader } from "../../../../Common/FormComponents/common/styleLibrary";
33+
import {
34+
actionsTray,
35+
containerForHeader,
36+
searchField,
37+
} from "../../../../Common/FormComponents/common/styleLibrary";
3438
import PageHeader from "../../../../Common/PageHeader/PageHeader";
3539

3640
const styles = (theme: Theme) =>
@@ -63,18 +67,8 @@ const styles = (theme: Theme) =>
6367
},
6468
},
6569
},
66-
actionsTray: {
67-
textAlign: "right",
68-
"& button": {
69-
marginLeft: 10,
70-
},
71-
},
72-
searchField: {
73-
background: "#FFFFFF",
74-
padding: 12,
75-
borderRadius: 5,
76-
boxShadow: "0px 3px 6px #00000012",
77-
},
70+
...actionsTray,
71+
...searchField,
7872
...containerForHeader(theme.spacing(4)),
7973
});
8074

portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ export const checkboxIcons = {
7575
unCheckedIcon: { ...checkBoxBasic, border: "1px solid #d0d0d0" },
7676
checkedIcon: {
7777
...checkBoxBasic,
78-
border: "1px solid #201763",
79-
backgroundColor: "#201763",
78+
border: "1px solid #081C42",
79+
backgroundColor: "#081C42",
8080
},
8181
};
8282

@@ -95,3 +95,35 @@ export const containerForHeader = (bottomSpacing: any) => ({
9595
},
9696
},
9797
});
98+
99+
export const actionsTray = {
100+
actionsTray: {
101+
display: "flex",
102+
justifyContent: "space-between",
103+
"& button": {
104+
flexGrow: 0,
105+
marginLeft: 15,
106+
},
107+
},
108+
};
109+
110+
export const searchField = {
111+
searchField: {
112+
flexGrow: 1,
113+
marginRight: 30,
114+
background: "#FFFFFF",
115+
borderRadius: 5,
116+
border: "#EAEDEE 1px solid",
117+
display: "flex",
118+
justifyContent: "center",
119+
padding: "0 16px",
120+
"& input": {
121+
fontSize: 14,
122+
color: "#000",
123+
"&::placeholder": {
124+
color: "#393939",
125+
opacity: 1,
126+
},
127+
},
128+
},
129+
};

portal-ui/src/screens/Console/Common/TableWrapper/TableActionIcons/common.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ export interface IIcon {
22
active: boolean;
33
}
44

5-
export const unSelected = "#adadad";
6-
export const selected = "#201763";
5+
export const unSelected = "#081C42";
6+
export const selected = "#081C42";

portal-ui/src/screens/Console/Common/TableWrapper/TableWrapper.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ const styles = (theme: Theme) =>
119119
},
120120
rowSelected: {
121121
...rowText,
122-
color: "#201763",
122+
color: "#081C42",
123123
},
124124
paginatorContainer: {
125125
display: "flex",

portal-ui/src/screens/Console/Configurations/ConfigurationPanels/ConfigurationsList.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,11 @@ import TableWrapper from "../../Common/TableWrapper/TableWrapper";
2727
import { configurationElements } from "../utils";
2828
import { IConfigurationElement } from "../types";
2929
import EditConfiguration from "../CustomForms/EditConfiguration";
30-
import { containerForHeader } from "../../Common/FormComponents/common/styleLibrary";
30+
import {
31+
actionsTray,
32+
containerForHeader,
33+
searchField,
34+
} from "../../Common/FormComponents/common/styleLibrary";
3135
import PageHeader from "../../Common/PageHeader/PageHeader";
3236

3337
interface IListConfiguration {
@@ -45,21 +49,11 @@ const styles = (theme: Theme) =>
4549
keyName: {
4650
marginLeft: 5,
4751
},
48-
actionsTray: {
49-
textAlign: "right",
50-
"& button": {
51-
marginLeft: 10,
52-
},
53-
},
54-
searchField: {
55-
background: "#FFFFFF",
56-
padding: 12,
57-
borderRadius: 5,
58-
boxShadow: "0px 3px 6px #00000012",
59-
},
6052
iconText: {
6153
lineHeight: "24px",
6254
},
55+
...searchField,
56+
...actionsTray,
6357
...containerForHeader(theme.spacing(4)),
6458
});
6559

portal-ui/src/screens/Console/Groups/Groups.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,11 @@ import AddGroup from "../Groups/AddGroup";
3131
import DeleteGroup from "./DeleteGroup";
3232
import TableWrapper from "../Common/TableWrapper/TableWrapper";
3333
import SetPolicy from "../Policies/SetPolicy";
34-
import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
34+
import {
35+
actionsTray,
36+
containerForHeader,
37+
searchField,
38+
} from "../Common/FormComponents/common/styleLibrary";
3539
import PageHeader from "../Common/PageHeader/PageHeader";
3640

3741
interface IGroupsProps {
@@ -74,18 +78,8 @@ const styles = (theme: Theme) =>
7478
},
7579
},
7680
},
77-
actionsTray: {
78-
textAlign: "right",
79-
"& button": {
80-
marginLeft: 10,
81-
},
82-
},
83-
searchField: {
84-
background: "#FFFFFF",
85-
padding: 12,
86-
borderRadius: 5,
87-
boxShadow: "0px 3px 6px #00000012",
88-
},
81+
...actionsTray,
82+
...searchField,
8983
...containerForHeader(theme.spacing(4)),
9084
});
9185

portal-ui/src/screens/Console/NotificationEndopoints/ListNotificationEndpoints.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,11 @@ import api from "../../../common/api";
3535
import FiberManualRecordIcon from "@material-ui/icons/FiberManualRecord";
3636
import TableWrapper from "../Common/TableWrapper/TableWrapper";
3737
import AddNotificationEndpoint from "./AddNotificationEndpoint";
38-
import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
38+
import {
39+
actionsTray,
40+
containerForHeader,
41+
searchField,
42+
} from "../Common/FormComponents/common/styleLibrary";
3943
import PageHeader from "../Common/PageHeader/PageHeader";
4044

4145
interface IListNotificationEndpoints {
@@ -53,21 +57,11 @@ const styles = (theme: Theme) =>
5357
keyName: {
5458
marginLeft: 5,
5559
},
56-
actionsTray: {
57-
textAlign: "right",
58-
"& button": {
59-
marginLeft: 10,
60-
},
61-
},
62-
searchField: {
63-
background: "#FFFFFF",
64-
padding: 12,
65-
borderRadius: 5,
66-
boxShadow: "0px 3px 6px #00000012",
67-
},
6860
iconText: {
6961
lineHeight: "24px",
7062
},
63+
...actionsTray,
64+
...searchField,
7165
...containerForHeader(theme.spacing(4)),
7266
});
7367

portal-ui/src/screens/Console/ObjectBrowser/BrowseBuckets.tsx

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ import { Bucket, BucketList } from "../Buckets/types";
3131
import TableWrapper from "../Common/TableWrapper/TableWrapper";
3232
import api from "../../../common/api";
3333
import history from "../../../history";
34+
import {
35+
actionsTray,
36+
searchField,
37+
} from "../Common/FormComponents/common/styleLibrary";
3438

3539
const styles = (theme: Theme) =>
3640
createStyles({
@@ -62,25 +66,15 @@ const styles = (theme: Theme) =>
6266
},
6367
},
6468
},
65-
actionsTray: {
66-
textAlign: "right",
67-
"& button": {
68-
marginLeft: 10,
69-
},
70-
},
71-
searchField: {
72-
background: "#FFFFFF",
73-
padding: 12,
74-
borderRadius: 5,
75-
boxShadow: "0px 3px 6px #00000012",
76-
},
7769
usedSpaceCol: {
7870
width: 150,
7971
},
8072
subTitleLabel: {
8173
alignItems: "center",
8274
display: "flex",
8375
},
76+
...actionsTray,
77+
...searchField,
8478
});
8579

8680
interface IBrowseBucketsProps {
@@ -162,10 +156,10 @@ const BrowseBuckets = ({ classes }: IBrowseBucketsProps) => {
162156
/>
163157
)}
164158
<Grid container>
165-
<Grid item xs={6} className={classes.subTitleLabel}>
159+
<Grid item xs={2} className={classes.subTitleLabel}>
166160
<Typography variant="h6">Buckets</Typography>
167161
</Grid>
168-
<Grid item xs={6} className={classes.actionsTray}>
162+
<Grid item xs={10} className={classes.actionsTray}>
169163
<TextField
170164
placeholder="Search Buckets"
171165
className={classes.searchField}

portal-ui/src/screens/Console/Policies/Policies.tsx

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ import AddPolicy from "./AddPolicy";
3030
import DeletePolicy from "./DeletePolicy";
3131
import TableWrapper from "../Common/TableWrapper/TableWrapper";
3232
import api from "../../../common/api";
33-
import { containerForHeader } from "../Common/FormComponents/common/styleLibrary";
33+
import {
34+
actionsTray,
35+
containerForHeader,
36+
searchField,
37+
} from "../Common/FormComponents/common/styleLibrary";
3438
import PageHeader from "../Common/PageHeader/PageHeader";
3539

3640
const styles = (theme: Theme) =>
@@ -63,18 +67,8 @@ const styles = (theme: Theme) =>
6367
},
6468
},
6569
},
66-
actionsTray: {
67-
textAlign: "right",
68-
"& button": {
69-
marginLeft: 10,
70-
},
71-
},
72-
searchField: {
73-
background: "#FFFFFF",
74-
padding: 12,
75-
borderRadius: 5,
76-
boxShadow: "0px 3px 6px #00000012",
77-
},
70+
...actionsTray,
71+
...searchField,
7872
...containerForHeader(theme.spacing(4)),
7973
});
8074

0 commit comments

Comments
 (0)