Skip to content

Commit c99e0bf

Browse files
bexsofthuncrys
authored andcommitted
Updated design of License page (minio#3540)
- This change doesn't include the new logo for Object Store, this needs to be addressed on MDS Signed-off-by: Benjamin Perez <benjamin@bexsoft.net>
1 parent cb918ee commit c99e0bf

File tree

3 files changed

+59
-53
lines changed

3 files changed

+59
-53
lines changed

web-app/src/screens/Console/License/License.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,7 @@ const License = () => {
121121

122122
return (
123123
<Fragment>
124-
<PageHeaderWrapper label="MinIO License and Support Plan" />
125-
124+
<PageHeaderWrapper label="Community and Enterprise Editions" />
126125
<PageLayout>
127126
<LicensePlans
128127
activateProductModal={activateProductModal}

web-app/src/screens/Console/License/LicensePlans.tsx

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -32,52 +32,49 @@ interface IRegisterStatus {
3232

3333
const LicensesInformation = styled.div(({ theme }) => ({
3434
display: "grid",
35-
gridTemplateColumns: "repeat(1, minmax(350px, 400px));",
36-
alignItems: "center",
37-
justifyContent: "center",
35+
gridTemplateColumns: "repeat(3, minmax(270px, 320px))",
36+
justifyContent: "flex-start",
3837
marginTop: 30,
3938
marginLeft: 30,
4039
"& > div": {
4140
borderBottom: `${get(theme, "borderColor", "#EAEAEA")} 1px solid`,
42-
padding: "13px 20px",
41+
padding: "25px 30px",
4342
justifyContent: "center",
43+
"&.first": {
44+
padding: 0,
45+
},
4446
"&.openSource": {
45-
borderRight: `#002562 2px solid`,
46-
borderLeft: `#002562 2px solid`,
47-
position: "relative",
48-
"&.first:before": {
49-
content: "' '",
50-
width: "calc(100% + 4px)",
51-
height: 16,
52-
display: "block",
53-
backgroundColor: "#001F55",
54-
position: "absolute",
55-
top: -14,
56-
left: -2,
57-
border: `#002562 2px solid`,
58-
borderBottom: 0,
47+
borderRight: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
48+
borderLeft: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
49+
"&.first": {
50+
borderTop: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
5951
borderTopLeftRadius: 12,
6052
borderTopRightRadius: 12,
6153
},
6254
"&.last": {
6355
paddingBottom: 30,
64-
"&:after": {
65-
content: "' '",
66-
width: "calc(100% + 4px)",
67-
height: 16,
68-
display: "block",
69-
position: "absolute",
70-
bottom: -14,
71-
left: -2,
72-
border: `#002562 2px solid`,
73-
borderTop: 0,
74-
borderBottomLeftRadius: 12,
75-
borderBottomRightRadius: 12,
76-
},
56+
borderBottom: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
57+
borderBottomLeftRadius: 12,
58+
borderBottomRightRadius: 12,
59+
},
60+
},
61+
"&.enterprise": {
62+
borderRight: `#a0a0a0 2px solid`,
63+
borderLeft: `#a0a0a0 2px solid`,
64+
"&.first": {
65+
borderTop: `#a0a0a0 2px solid`,
66+
borderTopLeftRadius: 12,
67+
borderTopRightRadius: 12,
68+
},
69+
"&.last": {
70+
paddingBottom: 30,
71+
borderBottom: `#a0a0a0 2px solid`,
72+
borderBottomLeftRadius: 12,
73+
borderBottomRightRadius: 12,
7774
},
7875
},
7976
"&.feature-information": {
80-
textAlign: "center",
77+
textAlign: "center" as const,
8178
},
8279
"&.feature-label": {
8380
paddingLeft: 5,
@@ -88,23 +85,27 @@ const LicensesInformation = styled.div(({ theme }) => ({
8885
},
8986
"& .planName": {
9087
fontWeight: 600,
91-
fontSize: 32,
92-
marginBottom: 24,
93-
textAlign: "center",
94-
marginTop: 8,
88+
fontSize: 18,
89+
textAlign: "center" as const,
90+
color: "#fff",
91+
marginBottom: 30,
92+
padding: "8px 0",
93+
borderTopLeftRadius: 10,
94+
borderTopRightRadius: 10,
95+
"&.openSource": {
96+
backgroundColor: `${get(theme, "signalColors.main", "#002562")}`,
97+
},
98+
"&.enterprise": {
99+
backgroundColor: "#a0a0a0",
100+
},
95101
},
96102
"& .planIcon": {
97-
height: 45,
103+
height: 90,
98104
display: "flex",
99105
alignItems: "flex-start",
100106
justifyContent: "center",
101107
"& svg": {
102-
height: 35,
103-
},
104-
"&.commercial": {
105-
"& svg": {
106-
height: 20,
107-
},
108+
height: 50,
108109
},
109110
},
110111
"& .planDescription": {
@@ -128,7 +129,7 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => {
128129
sx={{
129130
marginTop: "12px",
130131
width: "80%",
131-
height: "55px",
132+
height: "40px",
132133
}}
133134
onClick={(e) => {
134135
e.preventDefault();
@@ -157,10 +158,16 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => {
157158
<LicensesInformation>
158159
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
159160
return (
160-
<Box className={`${index === 1 ? "openSource first" : ""}`}>
161+
<Box
162+
className={`first ${index === 1 ? "openSource" : index === 2 ? "enterprise" : ""}`}
163+
>
161164
{element !== null && (
162165
<Box>
163-
<Box className={"planName"}>{element.planName}</Box>
166+
<Box
167+
className={`planName ${index === 1 ? "openSource" : index === 2 ? "enterprise" : ""}`}
168+
>
169+
{element.planName}
170+
</Box>
164171
<Box
165172
className={`planIcon ${
166173
element.planType === "commercial" ? "commercial" : ""
@@ -190,7 +197,7 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => {
190197
feature.featurePlans.openSource || null,
191198
)}
192199
</Box>
193-
<Box className={`feature-information ${lastItem}`}>
200+
<Box className={`feature-information enterprise ${lastItem}`}>
194201
{renderFeatureInformation(feature.featurePlans.eosPlus || null)}
195202
</Box>
196203
</Fragment>
@@ -199,8 +206,8 @@ const LicensePlans = ({ licenseInfo }: IRegisterStatus) => {
199206
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
200207
return (
201208
<Box
202-
className={`${
203-
index === 1 ? "openSource last" : ""
209+
className={`last ${
210+
index === 1 ? "openSource" : index === 2 ? "enterprise" : ""
204211
} noBorderBottom`}
205212
sx={{
206213
display: "flex",

web-app/src/screens/Console/License/utils.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export const FEATURE_ITEMS: PlansFeatures[] = [
115115
export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [
116116
{
117117
planId: "openSource",
118-
planName: "Community Edition",
118+
planName: "Community",
119119
planType: "open-source",
120120
planIcon: (
121121
<ApplicationLogo applicationName={"console"} subVariant={"AGPL"} />
@@ -124,7 +124,7 @@ export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [
124124
},
125125
{
126126
planId: "eosPlus",
127-
planName: "Enterprise Edition",
127+
planName: "Enterprise",
128128
planType: "commercial",
129129
planIcon: (
130130
<ApplicationLogo applicationName={"minio"} subVariant={"enterpriseos"} />

0 commit comments

Comments
 (0)