Skip to content

Commit 0398c69

Browse files
authored
Updated design of License page (#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 7871f6b commit 0398c69

File tree

3 files changed

+58
-50
lines changed

3 files changed

+58
-50
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const License = () => {
3030

3131
return (
3232
<Fragment>
33-
<PageHeaderWrapper label="MinIO License and Support Plan" />
33+
<PageHeaderWrapper label="Community and Enterprise Editions" />
3434
<PageLayout>
3535
<LicensePlans />
3636
</PageLayout>

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

Lines changed: 55 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,49 @@ import CheckIcon from "./CheckIcon";
2323

2424
const LicensesInformation = styled.div(({ theme }) => ({
2525
display: "grid",
26-
gridTemplateColumns: "repeat(3, minmax(350px, 400px))",
26+
gridTemplateColumns: "repeat(3, minmax(270px, 320px))",
2727
justifyContent: "flex-start",
2828
marginTop: 30,
2929
marginLeft: 30,
3030
"& > div": {
3131
borderBottom: `${get(theme, "borderColor", "#EAEAEA")} 1px solid`,
32-
padding: "25px 40px",
32+
padding: "25px 30px",
3333
justifyContent: "center",
34+
"&.first": {
35+
padding: 0,
36+
},
3437
"&.openSource": {
35-
borderRight: `#002562 2px solid`,
36-
borderLeft: `#002562 2px solid`,
37-
position: "relative",
38-
"&.first:before": {
39-
content: "' '",
40-
width: "calc(100% + 4px)",
41-
height: 16,
42-
display: "block",
43-
backgroundColor: "#001F55",
44-
position: "absolute",
45-
top: -14,
46-
left: -2,
47-
border: `#002562 2px solid`,
48-
borderBottom: 0,
38+
borderRight: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
39+
borderLeft: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
40+
"&.first": {
41+
borderTop: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
4942
borderTopLeftRadius: 12,
5043
borderTopRightRadius: 12,
5144
},
5245
"&.last": {
5346
paddingBottom: 30,
54-
"&:after": {
55-
content: "' '",
56-
width: "calc(100% + 4px)",
57-
height: 16,
58-
display: "block",
59-
position: "absolute",
60-
bottom: -14,
61-
left: -2,
62-
border: `#002562 2px solid`,
63-
borderTop: 0,
64-
borderBottomLeftRadius: 12,
65-
borderBottomRightRadius: 12,
66-
},
47+
borderBottom: `${get(theme, "signalColors.main", "#002562")} 2px solid`,
48+
borderBottomLeftRadius: 12,
49+
borderBottomRightRadius: 12,
50+
},
51+
},
52+
"&.enterprise": {
53+
borderRight: `#a0a0a0 2px solid`,
54+
borderLeft: `#a0a0a0 2px solid`,
55+
"&.first": {
56+
borderTop: `#a0a0a0 2px solid`,
57+
borderTopLeftRadius: 12,
58+
borderTopRightRadius: 12,
59+
},
60+
"&.last": {
61+
paddingBottom: 30,
62+
borderBottom: `#a0a0a0 2px solid`,
63+
borderBottomLeftRadius: 12,
64+
borderBottomRightRadius: 12,
6765
},
6866
},
6967
"&.feature-information": {
70-
textAlign: "center",
68+
textAlign: "center" as const,
7169
},
7270
"&.feature-label": {
7371
paddingLeft: 5,
@@ -78,23 +76,27 @@ const LicensesInformation = styled.div(({ theme }) => ({
7876
},
7977
"& .planName": {
8078
fontWeight: 600,
81-
fontSize: 32,
82-
marginBottom: 24,
83-
textAlign: "center",
84-
marginTop: 8,
79+
fontSize: 18,
80+
textAlign: "center" as const,
81+
color: "#fff",
82+
marginBottom: 30,
83+
padding: "8px 0",
84+
borderTopLeftRadius: 10,
85+
borderTopRightRadius: 10,
86+
"&.openSource": {
87+
backgroundColor: `${get(theme, "signalColors.main", "#002562")}`,
88+
},
89+
"&.enterprise": {
90+
backgroundColor: "#a0a0a0",
91+
},
8592
},
8693
"& .planIcon": {
87-
height: 100,
94+
height: 90,
8895
display: "flex",
8996
alignItems: "flex-start",
9097
justifyContent: "center",
9198
"& svg": {
92-
height: 80,
93-
},
94-
"&.commercial": {
95-
"& svg": {
96-
height: 70,
97-
},
99+
height: 50,
98100
},
99101
},
100102
"& .planDescription": {
@@ -116,7 +118,7 @@ const LicensePlans = () => {
116118
sx={{
117119
marginTop: "12px",
118120
width: "80%",
119-
height: "55px",
121+
height: "40px",
120122
}}
121123
onClick={(e) => {
122124
e.preventDefault();
@@ -145,10 +147,16 @@ const LicensePlans = () => {
145147
<LicensesInformation>
146148
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
147149
return (
148-
<Box className={`${index === 1 ? "openSource first" : ""}`}>
150+
<Box
151+
className={`first ${index === 1 ? "openSource" : index === 2 ? "enterprise" : ""}`}
152+
>
149153
{element !== null && (
150154
<Box>
151-
<Box className={"planName"}>{element.planName}</Box>
155+
<Box
156+
className={`planName ${index === 1 ? "openSource" : index === 2 ? "enterprise" : ""}`}
157+
>
158+
{element.planName}
159+
</Box>
152160
<Box
153161
className={`planIcon ${
154162
element.planType === "commercial" ? "commercial" : ""
@@ -178,7 +186,7 @@ const LicensePlans = () => {
178186
feature.featurePlans.openSource || null,
179187
)}
180188
</Box>
181-
<Box className={`feature-information ${lastItem}`}>
189+
<Box className={`feature-information enterprise ${lastItem}`}>
182190
{renderFeatureInformation(feature.featurePlans.eosPlus || null)}
183191
</Box>
184192
</Fragment>
@@ -187,8 +195,8 @@ const LicensePlans = () => {
187195
{[null, ...LICENSE_PLANS_INFORMATION].map((element, index) => {
188196
return (
189197
<Box
190-
className={`${
191-
index === 1 ? "openSource last" : ""
198+
className={`last ${
199+
index === 1 ? "openSource" : index === 2 ? "enterprise" : ""
192200
} noBorderBottom`}
193201
sx={{
194202
display: "flex",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const FEATURE_ITEMS: PlansFeatures[] = [
123123
export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [
124124
{
125125
planId: "openSource",
126-
planName: "Community Edition",
126+
planName: "Community",
127127
planType: "open-source",
128128
planIcon: (
129129
<ApplicationLogo applicationName={"console"} subVariant={"AGPL"} />
@@ -132,7 +132,7 @@ export const LICENSE_PLANS_INFORMATION: LicensePlanOption[] = [
132132
},
133133
{
134134
planId: "eosPlus",
135-
planName: "Enterprise Edition",
135+
planName: "Enterprise",
136136
planType: "commercial",
137137
planIcon: (
138138
<ApplicationLogo applicationName={"aistor"} subVariant={"enterprise"} />

0 commit comments

Comments
 (0)