Skip to content

Commit 9b06748

Browse files
authored
Match button's height. Remove Margin+Padding on Panel Titles. Move List bucket Buttons. (#1191)
Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com>
1 parent 6e3c0bd commit 9b06748

File tree

16 files changed

+228
-192
lines changed

16 files changed

+228
-192
lines changed

portal-ui/src/index.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import Routes from "./Routes";
2121
import configureStore from "./store";
2222
import * as serviceWorker from "./serviceWorker";
2323
import {
24-
ThemeProvider,
25-
Theme,
2624
StyledEngineProvider,
25+
Theme,
26+
ThemeProvider,
2727
} from "@mui/material/styles";
2828
import withStyles from "@mui/styles/withStyles";
2929
import "react-virtualized/styles.css";
@@ -42,10 +42,13 @@ const GlobalCss = withStyles({
4242
// @global is handled by jss-plugin-global.
4343
"@global": {
4444
// You should target [class*="MuiButton-root"] instead if you nest themes.
45+
".MuiButton-root": {
46+
height: 38,
47+
},
4548
".MuiButton-contained": {
4649
fontSize: "14px",
4750
textTransform: "capitalize",
48-
padding: "16px 25px 16px 25px",
51+
padding: "15px 25px 15px 25px",
4952
borderRadius: 3,
5053
},
5154
".MuiButton-sizeSmall": {

portal-ui/src/screens/Console/Buckets/BucketDetails/AccessDetailsPanel.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// You should have received a copy of the GNU Affero General Public License
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
import React, { useEffect, useState, Fragment } from "react";
17+
import React, { Fragment, useEffect, useState } from "react";
1818
import { connect } from "react-redux";
1919
import { Theme } from "@mui/material/styles";
2020
import createStyles from "@mui/styles/createStyles";
@@ -40,6 +40,7 @@ import {
4040
ADMIN_LIST_USER_POLICIES,
4141
ADMIN_LIST_USERS,
4242
} from "../../../../types";
43+
import PanelTitle from "../../Common/PanelTitle";
4344

4445
const styles = (theme: Theme) => createStyles({});
4546

@@ -159,7 +160,7 @@ const AccessDetails = ({
159160

160161
return (
161162
<Fragment>
162-
<h1 className={classes.sectionTitle}>Access Audit</h1>
163+
<PanelTitle>Access Audit</PanelTitle>
163164
<Tabs
164165
value={curTab}
165166
onChange={(e: React.ChangeEvent<{}>, newValue: number) => {

portal-ui/src/screens/Console/Buckets/BucketDetails/AccessRulePanel.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// You should have received a copy of the GNU Affero General Public License
1515
// along with this program. If not, see <http://www.gnu.org/licenses/>.
1616

17-
import React, { useEffect, useState, Fragment } from "react";
17+
import React, { Fragment, useEffect, useState } from "react";
1818
import { connect } from "react-redux";
1919
import { Theme } from "@mui/material/styles";
2020
import createStyles from "@mui/styles/createStyles";
@@ -40,6 +40,7 @@ import {
4040
import { BucketInfo } from "../types";
4141
import { displayComponent } from "../../../../utils/permissions";
4242
import { S3_GET_BUCKET_POLICY, S3_PUT_BUCKET_POLICY } from "../../../../types";
43+
import PanelTitle from "../../Common/PanelTitle";
4344

4445
const styles = (theme: Theme) =>
4546
createStyles({
@@ -240,7 +241,7 @@ const AccessRule = ({
240241
/>
241242
)}
242243
<Grid item xs={12} className={classes.actionsTray}>
243-
<h1 className={classes.sectionTitle}>Access Rules</h1>
244+
<PanelTitle>Access Rules</PanelTitle>
244245
{displayAddAccessRules && (
245246
<Button
246247
variant="contained"
@@ -256,9 +257,6 @@ const AccessRule = ({
256257
</Button>
257258
)}
258259
</Grid>
259-
<Grid item xs={12}>
260-
<br />
261-
</Grid>
262260
<Paper>
263261
<TableWrapper
264262
disabled={!displayAccessRules}

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketEventsPanel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ import {
4242
S3_GET_BUCKET_NOTIFICATIONS,
4343
S3_PUT_BUCKET_NOTIFICATIONS,
4444
} from "../../../../types";
45+
import PanelTitle from "../../Common/PanelTitle";
4546

4647
const styles = (theme: Theme) =>
4748
createStyles({
@@ -157,7 +158,7 @@ const BucketEventsPanel = ({
157158

158159
<Grid container>
159160
<Grid item xs={12} className={classes.actionsTray}>
160-
<h1 className={classes.sectionTitle}>Events</h1>
161+
<PanelTitle>Events</PanelTitle>
161162
{displaySubscribeToEvents && (
162163
<Button
163164
variant="contained"

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketLifecyclePanel.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,9 @@ import { displayComponent } from "../../../../utils/permissions";
4141
import {
4242
ADMIN_LIST_TIERS,
4343
S3_GET_LIFECYCLE_CONFIGURATION,
44-
S3_GET_REPLICATION_CONFIGURATION,
4544
S3_PUT_LIFECYCLE_CONFIGURATION,
46-
S3_PUT_REPLICATION_CONFIGURATION,
4745
} from "../../../../types";
46+
import PanelTitle from "../../Common/PanelTitle";
4847

4948
const styles = (theme: Theme) =>
5049
createStyles({
@@ -207,7 +206,7 @@ const BucketLifecyclePanel = ({
207206
)}
208207
<Grid container>
209208
<Grid item xs={12} className={classes.actionsTray}>
210-
<h1 className={classes.sectionTitle}>Lifecycle Rules</h1>
209+
<PanelTitle>Lifecycle Rules</PanelTitle>
211210
{displayAddLifeCycleRules && (
212211
<Button
213212
variant="contained"

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketReplicationPanel.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import {
3232
BucketReplication,
3333
BucketReplicationDestination,
3434
BucketReplicationRule,
35-
HasPermissionResponse,
3635
} from "../types";
3736
import { ErrorResponseHandler } from "../../../../common/types";
3837
import { AppState } from "../../../../store";
@@ -43,12 +42,10 @@ import DeleteReplicationRule from "./DeleteReplicationRule";
4342
import HelpBox from "../../../../common/HelpBox";
4443
import { displayComponent } from "../../../../utils/permissions";
4544
import {
46-
ADMIN_SERVER_INFO,
47-
S3_GET_BUCKET_NOTIFICATIONS,
4845
S3_GET_REPLICATION_CONFIGURATION,
49-
S3_PUT_BUCKET_NOTIFICATIONS,
5046
S3_PUT_REPLICATION_CONFIGURATION,
5147
} from "../../../../types";
48+
import PanelTitle from "../../Common/PanelTitle";
5249

5350
interface IBucketReplicationProps {
5451
classes: any;
@@ -179,7 +176,7 @@ const BucketReplicationPanel = ({
179176
)}
180177
<Grid container>
181178
<Grid item xs={12} className={classes.actionsTray}>
182-
<h1 className={classes.sectionTitle}>Replication</h1>
179+
<PanelTitle>Replication</PanelTitle>
183180
{displayAddReplicationRules && (
184181
<Button
185182
variant="contained"

portal-ui/src/screens/Console/Buckets/BucketDetails/BucketSummaryPanel.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ import {
6868
S3_PUT_BUCKET_VERSIONING,
6969
S3_PUT_OBJECT_RETENTION,
7070
} from "../../../../types";
71+
import PanelTitle from "../../Common/PanelTitle";
7172

7273
interface IBucketSummaryProps {
7374
classes: any;
@@ -483,7 +484,7 @@ const BucketSummary = ({
483484
)}
484485
<Grid container>
485486
<Grid item xs={12} className={classes.actionsTray}>
486-
<h1 className={classes.sectionTitle}>Summary</h1>
487+
<PanelTitle>Summary</PanelTitle>
487488
</Grid>
488489
</Grid>
489490
<Paper className={classes.paperContainer}>

0 commit comments

Comments
 (0)