Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump vanilla to 3.12.1 #12664

Merged
merged 1 commit into from
Mar 10, 2023
Merged

Bump vanilla to 3.12.1 #12664

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"typescript": "4.5.4",
"url-polyfill": "1.1.12",
"url-search-params-polyfill": "8.1.1",
"vanilla-framework": "^3.11.1",
"vanilla-framework": "^3.12.1",
"yup": "0.32.11"
},
"resolutions": {
Expand Down
12 changes: 6 additions & 6 deletions static/js/src/advantage/offers/components/Offer/Offer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ const Offer = ({ offer }: Props) => {
<Card data-testid="offer-card">
<Row>
<Col size={6} small={2} medium={2}>
<p className="p-text--x-small-capitalised">Contract item</p>
<p className="p-text--small-caps">Contract item</p>
</Col>
<Col size={3} small={1} medium={2}>
<p className="p-text--x-small-capitalised">Allowance</p>
<p className="p-text--small-caps">Allowance</p>
</Col>
<Col size={3} small={1} medium={2}>
<p className="p-text--x-small-capitalised">Price</p>
<p className="p-text--small-caps">Price</p>
</Col>
</Row>
<hr />
Expand Down Expand Up @@ -69,7 +69,7 @@ const Offer = ({ offer }: Props) => {
medium={2}
emptyMedium={3}
>
<p className="p-text--x-small-capitalised col-3 col-start-large-7">
<p className="p-text--small-caps col-3 col-start-large-7">
Total before taxes
</p>
</Col>
Expand All @@ -88,7 +88,7 @@ const Offer = ({ offer }: Props) => {
medium={2}
emptyMedium={3}
>
<p className="p-text--x-small-capitalised col-3 col-start-large-7">
<p className="p-text--small-caps col-3 col-start-large-7">
Discount amount
</p>
</Col>
Expand All @@ -108,7 +108,7 @@ const Offer = ({ offer }: Props) => {
medium={2}
emptyMedium={3}
>
<p className="p-text--x-small-capitalised col-3 col-start-large-7">
<p className="p-text--small-caps col-3 col-start-large-7">
Total after discount
</p>
</Col>
Expand Down
4 changes: 2 additions & 2 deletions ...ic/js/src/advantage/react/components/Subscriptions/SubscriptionList/ListCard/ListCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ const ListCard = ({
</h5>
{subscription.type === UserSubscriptionType.Legacy ? null : (
<span
className="p-text--x-small-capitalised u-text--muted p-subscriptions__list-card-period"
className="p-text--small-caps u-text--muted p-subscriptions__list-card-period"
data-test="card-type"
>
{subscription.type}
Expand Down Expand Up @@ -105,7 +105,7 @@ const ListCard = ({
</Row>
{getFeaturesDisplay(subscription.entitlements).included.length > 0 ? (
<List
className="p-subscriptions__list-card-features p-text--x-small-capitalised u-text--muted u-no-margin--bottom"
className="p-subscriptions__list-card-features p-text--small-caps u-text--muted u-no-margin--bottom"
data-test="card-entitlements"
inline
items={getFeaturesDisplay(subscription.entitlements).included}
Expand Down
2 changes: 1 addition & 1 deletion .../js/src/advantage/react/components/Subscriptions/SubscriptionList/ListGroup/ListGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const ListGroup = ({ children, title, marketplace }: Props): JSX.Element => {
setRefReady(true);
}}
>
<span className="p-text--x-small-capitalised u-align-text--small-to-default u-no-margin--bottom">
<span className="p-text--small-caps u-align-text--small-to-default u-no-margin--bottom">
{title}
</span>
{renewableSubscriptions?.length ?? 0 > 0 ? (
Expand Down
8 changes: 4 additions & 4 deletions static/js/src/advantage/subscribe/react/components/ProductSummary/ProductSummary.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ const ProductSummary = () => {
id="summary-section"
>
<Row className="u-sv3">
<Col size={6} className="p-text--x-small-capitalised">
<Col size={6} className="p-text--small-caps">
Subscription
</Col>
<Col size={2} className="u-align--right p-text--x-small-capitalised">
<Col size={2} className="u-align--right p-text--small-caps">
Quantity
</Col>
<Col size={2} className="p-text--x-small-capitalised">
<Col size={2} className="p-text--small-caps">
Billing
</Col>
<Col size={2} className="u-align--right p-text--x-small-capitalised">
<Col size={2} className="u-align--right p-text--small-caps">
Total
</Col>
<hr />
Expand Down
2 changes: 1 addition & 1 deletion static/js/src/advantage/users/components/Organisation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from "react";

const Organisation = ({ name }: { name: string }) => (
<>
<p className="p-text--x-small-capitalised">organisation</p>
<p className="p-text--small-caps">organisation</p>
<p className="p-heading--3 u-no-padding--top">{name}</p>
</>
);
Expand Down
4 changes: 2 additions & 2 deletions templates/certified/why-certify.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ <h3 class="p-heading--5 u-no-margin--bottom">Cost effective</h3>
<hr class="is-fixed-width">
<div class="row">
<div class="col-3">
<h2 class="p-text--x-small-capitalised">Different devices</h2>
<h2 class="p-text--small-caps">Different devices</h2>
</div>
<div class="col-3">
<h3 class="p-heading--2 u-no-padding--top">Server</h3>
Expand Down Expand Up @@ -207,7 +207,7 @@ <h2>Are you interested <br class="u-hide--medium u-hide--large">in <br class="u-
<hr class="is-fixed-width">
<div class="row">
<div class="col-3">
<h2 class="p-text--x-small-capitalised">Certification reference</h2>
<h2 class="p-text--small-caps">Certification reference</h2>
</div>
<div class="col-3">
<h3 class="p-heading--2 u-no-padding--top">Webinar</h3>
Expand Down
4 changes: 2 additions & 2 deletions templates/pricing/pro.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ <h5>Notes</h5>
</section>
<section class="p-strip is-deep u-no-padding--top">
<div class="u-fixed-width">
<p class="p-text--x-small-capitalised">Coverage options</p>
<p class="p-text--small-caps">Coverage options</p>
</div>
<div class="row">
<hr class="is-fixed-width u-no-margin--bottom">
Expand Down Expand Up @@ -440,7 +440,7 @@ <h3 class="p-heading--2">

<section class="p-strip is-deep u-no-padding--top">
<div class="row">
<h2 class="p-text--x-small-capitalised">Software-defined storage</h2>
<h2 class="p-text--small-caps">Software-defined storage</h2>
</div>

<div class="row">
Expand Down
10 changes: 5 additions & 5 deletions templates/pro/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ <h2>Same great OS.<br />More security updates.</h2>

<section class="p-strip is-deep u-no-padding--top">
<div class="row">
<h2 class="p-text--x-small-capitalised">Security coverage compared</h2>
<h2 class="p-text--small-caps">Security coverage compared</h2>
</div>

<div class="row pro-card-container">
Expand Down Expand Up @@ -535,7 +535,7 @@ <h2><a href="/contact-us/form?product=pro">Request your security assessment toda
</section>
<section class="p-strip is-x-deep u-no-padding--top u-no-padding--bottom">
<div class="u-fixed-width">
<h2 class="p-text--x-small-capitalised">Upgrade to Ubuntu Pro today</h2>
<h2 class="p-text--small-caps">Upgrade to Ubuntu Pro today</h2>
</div>
<hr class="is-fixed-width u-no-margin--bottom">
<div class="row u-no-padding--top u-sv3">
Expand Down Expand Up @@ -725,7 +725,7 @@ <h2>Available everywhere</h2>
<div class="p-strip u-no-padding--top">
<div class="row">
<div class="col-2 col-medium-3">
<p class="p-text--x-small-capitalised u-align-text--x-small-to-default">Public Clouds</p>
<p class="p-text--small-caps u-align-text--x-small-to-default">Public Clouds</p>
</div>
<div class="col-4 col-medium-3">
<p>
Expand Down Expand Up @@ -796,7 +796,7 @@ <h2>Available everywhere</h2>
<hr class="u-no-margin--bottom">
<div class="row">
<div class="col-2 col-medium-3">
<p class="p-text--x-small-capitalised u-align-text--x-small-to-default">Desktop</p>
<p class="p-text--small-caps u-align-text--x-small-to-default">Desktop</p>
</div>
<div class="col-4 col-medium-3">
<p>
Expand Down Expand Up @@ -827,7 +827,7 @@ <h2>Available everywhere</h2>
<hr class="u-no-margin--bottom">
<div class="row">
<div class="col-2 col-medium-3">
<p class="p-text--x-small-capitalised u-align-text--x-small-to-default">Server</p>
<p class="p-text--small-caps u-align-text--x-small-to-default">Server</p>
</div>
<div class="col-4 col-medium-3">
<p>
Expand Down
2 changes: 1 addition & 1 deletion templates/pro/tutorial.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ <h1 class="p-heading--2">Get started with Ubuntu Pro</h1>
<hr class="is-fixed-width u-no-margin--bottom">
<div class="row">
<div class="col-3 col-medium-1">
<h2 class="p-text--x-small-capitalised u-align-text--x-small-to-default">Overview</h2>
<h2 class="p-text--small-caps u-align-text--x-small-to-default">Overview</h2>
</div>
<div class="col-9 col-medium-5">
<p>New to Ubuntu Pro? This how-to guide will help you understand how to activate your Ubuntu Pro subscription and
Expand Down
2 changes: 1 addition & 1 deletion templates/security/esm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ <h2>What's the difference?</h2>

<section class="p-strip is-deep u-no-padding--top">
<div class="row">
<h3 class="p-text--x-small-capitalised">Case studies</h3>
<h3 class="p-text--small-caps">Case studies</h3>
<hr />
<div class="col-3">
<div style="max-width: 118px;">
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7555,10 +7555,10 @@ sass@1.45.2:
immutable "^4.0.0"
source-map-js ">=0.6.2 <2.0.0"

sass@1.58.0:
version "1.58.0"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.0.tgz#ee8aea3ad5ea5c485c26b3096e2df6087d0bb1cc"
integrity sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==
sass@1.58.3:
version "1.58.3"
resolved "https://registry.yarnpkg.com/sass/-/sass-1.58.3.tgz#2348cc052061ba4f00243a208b09c40e031f270d"
integrity sha512-Q7RaEtYf6BflYrQ+buPudKR26/lH+10EmO9bBqbmPh/KeLqv8bjpTNqxe71ocONqXq+jYiCbpPUmQMS+JJPk4A==
dependencies:
chokidar ">=3.0.0 <4.0.0"
immutable "^4.0.0"
Expand Down Expand Up @@ -8605,18 +8605,18 @@ vanilla-framework@3.0.1:
postcss-cli "9.1.0"
sass "1.45.2"

vanilla-framework@^3.11.1:
version "3.11.1"
resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.11.1.tgz#5fbb205ad37d14f6e82e0690d23eb391d621ba70"
integrity sha512-1MfCU30SXt56hEL+M4il/nAs3ZvK/ophS1VjL6DgBpo+7geXtS45jUREAvt3mESUvv5GWfhnYN5Mdgo10Nn/Aw==
vanilla-framework@^3.12.1:
version "3.12.1"
resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.12.1.tgz#b438f76816d1bb558eeea87e56987d755bf264ec"
integrity sha512-IbCb7gblPY1A1f89+mcyPvEC+2Zd1z2A0fB+L7tabXuBn/eu6eL8EAq1WY0Jc5hK3hws/YPyrhBzgUVAw2fglg==
dependencies:
"@canonical/cookie-policy" "3.4.0"
"@canonical/latest-news" "1.4.1"
autoprefixer "10.4.13"
postcss "8.4.21"
postcss-cli "9.1.0"
postcss-scss "4.0.6"
sass "1.58.0"
sass "1.58.3"
yaml "1.10.2"

verbalize@^0.1.2:
Expand Down