diff --git a/portal-ui/src/index.tsx b/portal-ui/src/index.tsx index 75b68b6c7..3872d527a 100644 --- a/portal-ui/src/index.tsx +++ b/portal-ui/src/index.tsx @@ -66,9 +66,6 @@ const GlobalCss = withStyles({ ".MuiButton-root": { height: 38, }, - ".MuiButtonBase-root": { - textTransform: "capitalize", - }, ".MuiButton-contained": { fontSize: "14px", textTransform: "capitalize", diff --git a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts index f37e7e80b..1cafe9304 100644 --- a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts +++ b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts @@ -362,7 +362,6 @@ export const objectBrowserCommon = { }, breadcrumbsMain: { display: "flex", - }, breadcrumbs: { fontSize: 12, diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx index e813ad94a..6d842c686 100644 --- a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx +++ b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/BasicDashboard.tsx @@ -121,7 +121,7 @@ const BasicDashboard = ({ usage }: IDashboardProps) => { gridTemplateColumns: "1fr", gap: "27px", marginBottom: "40px", - marginTop: "80px", + marginTop: "40px", marginLeft: "60px", marginRight: "60px", }} diff --git a/portal-ui/src/screens/Console/Policies/ListPolicies.tsx b/portal-ui/src/screens/Console/Policies/ListPolicies.tsx index a543c46b3..8754a59ba 100644 --- a/portal-ui/src/screens/Console/Policies/ListPolicies.tsx +++ b/portal-ui/src/screens/Console/Policies/ListPolicies.tsx @@ -224,9 +224,6 @@ const ListPolicies = ({ classes, setErrorSnackMessage }: IPoliciesProps) => { /> - -
-
{ /> - -
-
+ {loading && } {!loading && ( diff --git a/portal-ui/src/theme/main.ts b/portal-ui/src/theme/main.ts index bc14906d0..538618b34 100644 --- a/portal-ui/src/theme/main.ts +++ b/portal-ui/src/theme/main.ts @@ -71,6 +71,7 @@ const theme = createTheme({ MuiButton: { styleOverrides: { root: { + textTransform: "none", borderRadius: 3, height: 40, padding: "0 20px", @@ -112,6 +113,13 @@ const theme = createTheme({ }, }, }, + MuiTab: { + styleOverrides: { + root: { + textTransform: "none", + }, + }, + }, }, colors: { link: "#2781B0", diff --git a/portal-ui/tests/utils/elements.ts b/portal-ui/tests/utils/elements.ts index 5e6c3a1c2..27bd312d7 100644 --- a/portal-ui/tests/utils/elements.ts +++ b/portal-ui/tests/utils/elements.ts @@ -94,13 +94,13 @@ export const bucketsAccessInput = Selector( ); export const bucketsAccessReadOnlyInput = Selector( 'li[class*="MuiMenuItem-root"]' -).withText("Readonly"); +).withText("readonly"); export const bucketsAccessWriteOnlyInput = Selector( 'li[class*="MuiMenuItem-root"]' -).withText("Writeonly"); +).withText("writeonly"); export const bucketsAccessReadWriteInput = Selector( 'li[class*="MuiMenuItem-root"]' -).withText("Readwrite"); +).withText("readwrite"); export const uploadInput = Selector("input").withAttribute("type", "file"); export const createPolicyName = Selector("#policy-name"); export const createPolicyTextfield = Selector(".cm-content");