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

chore: Remove old Vanilla 2.0 related workarounds #5012

Merged
merged 4 commits into from
Feb 4, 2025
Merged

chore: Remove old Vanilla 2.0 related workarounds #5012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f8c6344
chore: Remove custom p-logo-link styles (from first snap flow)
bartaz Feb 4, 2025
0c77856
chore: remove old Vanilla 2.0 workaround for code snippets
bartaz Feb 4, 2025
249e097
chore: Remove u-flex utility and its references
bartaz Feb 4, 2025
19a0f34
chore: Remove unnecessary z-index
bartaz Feb 4, 2025
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
95 changes: 0 additions & 95 deletions static/sass/_patterns_logo-links.scss
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions static/sass/_snapcraft_release.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,10 +414,8 @@
white-space: nowrap;
}

// TODO[epic=vanilla]: LINK contextual menu
.p-contextual-menu__dropdown {
overflow: visible; // allow tooltips inside menu
z-index: 2; // workaround for https://github.com/canonical-web-and-design/vanilla-framework/issues/2577

.p-tooltip {
display: block;
Expand Down
7 changes: 0 additions & 7 deletions static/sass/_utilities_flex.scss
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions static/sass/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ $color-social-icon-foreground: $color-light;
@include vf-p-testimonial;
@import "button-overrides";
@include button-overrides;
@import "patterns_logo-links";
@include p-logo-link;
@import "snapcraft_market_screenshots";
@include snapcraft-market-screenshots;

Expand Down Expand Up @@ -141,8 +139,6 @@ $color-social-icon-foreground: $color-light;
@include snapcraft-p-table;
@import "utilities_no-limit";
@include u-no-limit;
@import "utilities_flex";
@include u-flex;
@import "utilities_disabled";
@include u-disabled;
@import "utilities_text-wrap";
Expand Down Expand Up @@ -224,13 +220,6 @@ dl {
text-overflow: ellipsis;
}

// This should be removed once vanilla is upgraded to v2.22.2
.p-code-snippet__block--icon.is-wrapped,
.p-code-snippet__block--numbered.is-wrapped,
.p-code-snippet__block.is-wrapped {
white-space: pre-wrap;
}

.p-modal__dialog {
@media only screen and (min-width: $breakpoint-small) {
min-width: 400px;
Expand Down
26 changes: 10 additions & 16 deletions templates/first-snap/install-snapcraft.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,22 @@ <h4>What operating system are you developing on?</h4>
</div>
<div class="row">
<div class="col-small-2 col-medium-2 col-2 col-logo">
<span class="p-logo-link p-card u-align-text--center js-os-select" data-os="linux">
<header class="p-card__header">
<img src="https://assets.ubuntu.com/v1/e95bac0c-tux.svg" alt="">
</header>
<div href="#" class="p-card u-align-text--center js-os-select" style="cursor: pointer;" data-os="linux">
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A bit quick'n'dirty way to make this not look broken without removed p-logo-link.

These pages don't seem linked from anywhere anymore, and are supposed to be removed as part of WD-18896 anyway.

<img src="https://assets.ubuntu.com/v1/e95bac0c-tux.svg" alt="">
<span>Linux</span>
</span>
</div>
</div>
<div class="col-small-2 col-medium-2 col-2 col-logo">
<span class="p-logo-link p-card u-align-text--center js-os-select" data-os="macos">
<header class="p-card__header">
<img src="https://assets.ubuntu.com/v1/236f314d-macos.svg" alt="">
</header>
<div href="#" class="p-card u-align-text--center js-os-select" style="cursor: pointer;" data-os="macos">
<img src="https://assets.ubuntu.com/v1/236f314d-macos.svg" alt="">
<span>macOS</span>
</span>
</div>
</div>
<div class="col-small-2 col-medium-2 col-2 col-logo">
<span class="p-logo-link p-card u-align-text--center is-disabled" data-os="windows">
<header class="p-card__header">
<img src="https://assets.ubuntu.com/v1/a9bfe4c5-win.svg" alt="">
</header>
<span>Windows</span>
</span>
<div href="#" class="p-card u-align-text--center is-disabled" data-os="windows">
<img src="https://assets.ubuntu.com/v1/a9bfe4c5-win.svg" style="filter: grayscale(1);" alt="">
<span>Windows Coming soon</span>
</div>
</div>
</div>

Expand Down
125 changes: 0 additions & 125 deletions templates/publisher/_header.html
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions templates/publisher/_noscript.html
View file
Open in desktop

This file was deleted.