Skip to content

Commit

Permalink
chore: upgrade vanilla v4 MAASENG-2086 (#5087)
Browse files Browse the repository at this point in the history
* fix: stepper center align text
* update overview card top padding
* fix secondary navigation top padding
  • Loading branch information
petermakowski authored Aug 16, 2023
1 parent 9469eb7 commit 90031df
Show file tree
Hide file tree
Showing 25 changed files with 33 additions and 200 deletions.
Binary file not shown.
Binary file removed assets/fonts/0bd4277a-UbuntuMono[wght]-latin.woff2
Binary file not shown.
Binary file not shown.
Binary file removed assets/fonts/57fdffc1-Ubuntu[wdth,wght]-greek.woff2
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed assets/fonts/f3b9cc97-Ubuntu[wdth,wght]-latin.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"redux-saga": "1.2.2",
"typed-redux-saga": "1.5.0",
"typescript": "5.1.3",
"vanilla-framework": "3.11.1",
"vanilla-framework": "4.0.0",
"yup": "0.32.11"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/app/base/components/AppSideNavigation/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
font-size: #{map-get($font-sizes, h4)}rem;
line-height: map-get($line-heights, x-small);
margin-bottom: 1.25rem !important;
padding-top: 0.051rem !important;
padding-top: 0 !important;
margin-left: 2rem !important;
@media only screen and (min-width: ($breakpoint-small + 1)) {
margin-left: 2.5rem !important;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const SecondaryNavigation = ({
className={`p-side-navigation__drawer is-maas-${theme}--accent u-padding-top--medium`}
>
<h2
className="p-side-navigation__title p-heading--4 p-panel__logo-name"
className="p-side-navigation__title p-heading--4 p-panel__logo-name u-no-padding--top"
data-testid="section-header-title"
>
{title}
Expand Down
1 change: 1 addition & 0 deletions src/app/base/components/SectionHeader/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

.section-header__title {
margin: 0 $sph--large $spv--large 0;
padding-top: 0.051rem;
}

.section-header__subtitle {
Expand Down
1 change: 1 addition & 0 deletions src/app/base/components/Stepper/_index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
margin-bottom: $spv--x-small;

&::before {
text-align: center;
background-color: $color-light;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const ControllerStatusCard = ({ controller }: Props): JSX.Element => {
return (
<>
<div className="overview-card__status" data-testid="controller-status">
<strong className="p-muted-heading">Overview</strong>
<strong className="p-muted-heading u-no-padding--top">Overview</strong>
<h4 className="u-no-margin--bottom">
{controller.node_type_display}&nbsp;
{controller.versions && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ const CpuCard = ({ node, setSidePanelContent }: Props): JSX.Element => (
<>
<div className="overview-card__cpu">
<div className="u-flex--between">
<strong className="p-muted-heading u-no-margin--bottom">CPU</strong>
<strong className="p-muted-heading u-no-margin--bottom u-no-padding--top">
CPU
</strong>
<small className="u-no-margin--bottom u-text--muted">
{node.architecture}
</small>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ const MachineStatusCard = ({ machine }: Props): JSX.Element => {
return (
<>
<div className="overview-card__status" data-testid="machine-status">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom u-no-padding--top">
{isVM(machine, machineTags)
? "Virtual Machine Status"
: "Machine Status"}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type Props = {
const MemoryCard = ({ node, setSidePanelContent }: Props): JSX.Element => (
<>
<div className="overview-card__memory">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom u-no-padding--top">
Memory
</strong>
<h4 className="u-no-margin--bottom">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type Props = {
const StorageCard = ({ node, setSidePanelContent }: Props): JSX.Element => (
<>
<div className="overview-card__storage">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom">
<strong className="p-muted-heading u-flex--between u-no-margin--bottom u-no-padding--top">
Storage
</strong>
<h4 className="u-no-margin--bottom">
Expand Down
Loading

0 comments on commit 90031df

Please sign in to comment.