From 3d858ac04a474ece2e5b0a9bc386cca94fcafc2b Mon Sep 17 00:00:00 2001 From: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> Date: Tue, 19 Oct 2021 10:47:28 -0700 Subject: [PATCH] Limit Max Width of all containers to 1180px (#1123) Signed-off-by: Daniel Valdivia <18384552+dvaldivia@users.noreply.github.com> --- .../Buckets/ListBuckets/ListBuckets.tsx | 3 + .../FormComponents/common/styleLibrary.ts | 1 + .../src/screens/Console/License/License.tsx | 488 +++++++++--------- 3 files changed, 254 insertions(+), 238 deletions(-) diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx index 5a876ad89..7a1d6f9e4 100644 --- a/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx +++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/ListBuckets.tsx @@ -114,6 +114,9 @@ const styles = (theme: Theme) => marginLeft: 10, }, ...containerForHeader(theme.spacing(4)), + constrainedContainer: { + maxWidth: 1180, + }, }); interface IListBucketsProps { 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 dcd343c16..1f3184e9f 100644 --- a/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts +++ b/portal-ui/src/screens/Console/Common/FormComponents/common/styleLibrary.ts @@ -133,6 +133,7 @@ export const radioIcons = { export const containerForHeader = (bottomSpacing: any) => ({ container: { position: "relative" as const, + maxWidth: 1180, padding: "20px 35px 0", "& h6": { color: "#777777", diff --git a/portal-ui/src/screens/Console/License/License.tsx b/portal-ui/src/screens/Console/License/License.tsx index d6b61f029..d91a24c06 100644 --- a/portal-ui/src/screens/Console/License/License.tsx +++ b/portal-ui/src/screens/Console/License/License.tsx @@ -257,7 +257,8 @@ const styles = (theme: Theme) => }, }, planItemsPadding: { - padding: "23px 33px", + padding: "23px 0px", + maxWidth: 1180, }, subnetSubTitle: { fontSize: 12, @@ -362,247 +363,258 @@ const License = ({ classes, operatorMode }: ILicenseProps) => { - - - - {licenseInfo ? ( - - - - - License - - - Commercial License - - - Organization - - - {licenseInfo.organization} - - - Registered Capacity - - - {niceBytes( - (licenseInfo.storage_capacity * 1099511627776) // 1 Terabyte = 1099511627776 Bytes - .toString(10) - )} - - - Expiry Date - - - - {licenseInfo.expires_at} - - + + + + + {licenseInfo ? ( + + + + + License + + + Commercial License + + + Organization + + + {licenseInfo.organization} + + + Registered Capacity + + + {niceBytes( + (licenseInfo.storage_capacity * 1099511627776) // 1 Terabyte = 1099511627776 Bytes + .toString(10) + )} + + + Expiry Date + + + + {licenseInfo.expires_at} + + + + + + Subscription Plan + + + {licenseInfo.plan} + + + Requester + + + {licenseInfo.email} + + + verified - - - Subscription Plan - - - {licenseInfo.plan} - - - Requester - - - {licenseInfo.email} - - - verified + ) : ( + + setLicenseModal(false)} /> - - - ) : ( - - setLicenseModal(false)} - /> - - agpl - - - - GNU Affero General Public License - - - -
setLicenseModal(true)} - className={classes.clickableBlock} - > - Version 3 - - The GNU Affero General Public License is a free, - copyleft license for software and other kinds of works, - specifically designed to ensure cooperation with the - Community in the case of network server software. + + agpl + + + + GNU Affero General Public License -
-
-
- )} -
- - {licenseInfo ? ( - - - Login to MinIO SUBNET ! - - - It combines a commercial license with a support experience - unlike any other. - -
- - {operatorMode && ( - - {" "} -
-
- - {loadingRefreshLicense && ( - - )} -
- )} -
- ) : ( - - - Choosing between GNU AGPL v3 and Commercial License - - - If you are building proprietary applications, you may want - to choose the commercial license included as part of the - Standard and Enterprise subscription plans. Applications - must otherwise comply with all the GNU AGPLv3 License & - Trademark obligations. Follow the links below to learn more - about the compliance policy. - -
- - Open Source Policy Compliance - -
-
- - Trademark Policy - -
- )} + Version 3 + + The GNU Affero General Public License is a free, + copyleft license for software and other kinds of + works, specifically designed to ensure cooperation + with the Community in the case of network server + software. + + +
+
+ )} + + + {licenseInfo ? ( + + + Login to MinIO SUBNET ! + + + It combines a commercial license with a support experience + unlike any other. + +
+ + {operatorMode && ( + + {" "} +
+
+ + {loadingRefreshLicense && ( + + )} +
+ )} +
+ ) : ( + + + Choosing between GNU AGPL v3 and Commercial License + + + If you are building proprietary applications, you may want + to choose the commercial license included as part of the + Standard and Enterprise subscription plans. Applications + must otherwise comply with all the GNU AGPLv3 License & + Trademark obligations. Follow the links below to learn + more about the compliance policy. + +
+ + Open Source Policy Compliance + +
+
+ + Trademark Policy + +
+ )} +