diff --git a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx
index 4b8ee020c73..284c1422fc5 100644
--- a/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx
+++ b/static/js/src/advantage/subscribe/react/components/Form/Feature/Feature.tsx
@@ -25,170 +25,116 @@ const Feature = () => {
const proDisabled = version === LTSVersions.trusty;
return (
-
-
-
-
-
- Security coverage for critical, high and selected medium CVEs for:
-
-
-
-
- Over 2,300 open source deb packages in Ubuntu Main repository for
- 10 years, including:
-
-
-
-
-
- Over 23,000 open source deb packages in Ubuntu Universe repository
- for 10 years, including:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ <>
+
+ What security coverage do you need?
+
+
+
Not sure? Run [command] to find out which packages and repositories you are currently using.
+
+
+
+
+
+
+
+
+
+ { feature === Features.pro ? "25000" : "2300" }
+
+
+ Covers { feature === Features.pro ? "25000" : "2300" } packages in Ubuntu Main { feature === Features.pro ? "and Universe":""}
+
+
+
+
+ LTS standard security maintenance for Ubuntu Main (initial 5 years)
+ { feature===Features.pro && LTS Expanded Security Maintenance (ESM) for Ubuntu Main (additional 5 years)
}
+
+
+
+
+
+
+
+
+
+
+
+ { feature===Features.pro && <>
+
+
+
+
+
+
+
+ >}
+
+
+
+
{
23,000+
packages in Ubuntu universe, including:
-
+ >
);
};
export default Feature;
+
+{/*
+
+
+
+ Security coverage for critical, high and selected medium CVEs for:
+
+
+
+
+ Over 2,300 open source deb packages in Ubuntu Main repository for
+ 10 years, including:
+
+
+
+
+
+ Over 23,000 open source deb packages in Ubuntu Universe repository
+ for 10 years, including:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
*/}
\ No newline at end of file
diff --git a/static/js/src/advantage/subscribe/react/components/Form/Form.tsx b/static/js/src/advantage/subscribe/react/components/Form/Form.tsx
index c306cd5292e..10c74035ed9 100644
--- a/static/js/src/advantage/subscribe/react/components/Form/Form.tsx
+++ b/static/js/src/advantage/subscribe/react/components/Form/Form.tsx
@@ -76,12 +76,7 @@ const Form = () => {
-
- What security coverage do you need?
-
-
-
-
+
diff --git a/static/sass/_pattern_subscribe.scss b/static/sass/_pattern_subscribe.scss
index 5dd72cd07cd..25d2674d00e 100644
--- a/static/sass/_pattern_subscribe.scss
+++ b/static/sass/_pattern_subscribe.scss
@@ -27,11 +27,9 @@
margin-bottom: 2rem;
&::before {
- @extend .p-heading--3;
+ @extend .p-heading--2;
align-items: center;
- border: 1px solid;
- border-radius: 100%;
content: counter(headings);
display: inline-flex;
flex-shrink: 0;
diff --git a/static/sass/styles.scss b/static/sass/styles.scss
index 2722b57db73..cc4210c1fc7 100644
--- a/static/sass/styles.scss
+++ b/static/sass/styles.scss
@@ -1466,6 +1466,47 @@ $color-link-dark: #69c !default;
}
}
+.p-graphic-main{
+ width: 10%;
+ background: #923A66;
+ height: 48px;
+ display: inline-block;
+}
+
+.p-graphic-universe{
+ width: 90%;
+ background: #000000;
+ height: 48px;
+ display: inline-block;
+}
+.p-graphic-universe--empty{
+ border-width: 1px;
+ border-color: #757575;
+ border-style: dashed;
+ width: 90%;
+ height: 48px;
+ display: inline-block;
+}
+
+.graphic-legend-main, .graphic-legend-universe{
+ gap:1.2rem;
+ display: flex;
+ flex-direction: row;
+ &::before{
+ display: inline-flex;
+ height: 25px;
+ width: 25px;
+ content:"";
+ flex-shrink: 0;
+ }
+}
+.graphic-legend-main::before{
+ background: #923a66;
+}
+.graphic-legend-universe::before{
+ background: #000;
+}
+
// XXX: MPT: Can be removed once this is fixed in Vanilla
// https://github.com/canonical/vanilla-framework/pull/4950
.desktop-footer {
@@ -1493,3 +1534,5 @@ hr.is-extra-muted {
background-color: rgba(0, 0, 0, 0.1);
opacity: 0.5;
}
+
+