Skip to content

Commit

Permalink
Merge pull request canonical#13480 from canonical/desktop-refresh
Browse files Browse the repository at this point in the history
/desktop bubble refresh
  • Loading branch information
mtruj013 authored Feb 9, 2024
2 parents 90b4659 + 186050b commit 7508b69
Show file tree
Hide file tree
Showing 35 changed files with 3,436 additions and 2,043 deletions.
3 changes: 2 additions & 1 deletion build.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ let entries = {
"side-navigation": "./static/js/src/side-navigation.js",
"image-download": "./static/js/src/image-download.js",
main: "./static/js/src/main.js",
"release-chart": "./static/js/src/release-chart.js",
"release-chart-manager": "./static/js/src/release-chart-manager.js",
"developer-chart": "./static/js/src/developer-chart.js",
tabotronic: "./static/js/src/tabotronic.js",
appliance: "./static/js/src/appliance.js",
costCalculator: "./static/js/src/openstack/react/app.jsx",
Expand Down
2 changes: 0 additions & 2 deletions navigation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,6 @@ desktop:
path: /desktop/organisations
- title: Developers
path: /desktop/developers
- title: Partners
path: /desktop/partners
- title: Flavours
path: /desktop/flavours
- title: WSL
Expand Down
2 changes: 2 additions & 0 deletions redirects.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -297,8 +297,10 @@ desktop/get-ubuntu/upgrade/?: "/tutorials/tutorial-upgrading-ubuntu-desktop"
desktop/get.*/?: "/download/desktop"
desktop/government/?: "/desktop/organisations"
desktop/management/?: "/pricing/pro"
desktop/partners/?: "https://canonical.com/partners/desktop"
desktop/services/?: "/pricing/pro"
desktop/snappy/?: "/desktop/developers"
desktop/statistics/?: "/desktop"
desktop/take-the-tour-gallery/?: "http://tour.ubuntu.com/"
desktop/take-the-tour/?: "http://tour.ubuntu.com/"
desktop/tenders/?: "/desktop/contact-us"
Expand Down
6 changes: 3 additions & 3 deletions static/js/src/chart-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -1229,10 +1229,10 @@ export var microStackReleases = [
];

export var desktopServerStatus = {
HARDWARE_AND_MAINTENANCE_UPDATES: "chart__bar--orange",
HARDWARE_AND_MAINTENANCE_UPDATES: "chart__bar--black",
MAINTENANCE_UPDATES: "chart__bar--orange-light",
ESM: "chart__bar--aubergine",
MAIN_UNIVERSE: "chart__bar--charcoal",
ESM: "chart__bar--aubergine-light",
MAIN_UNIVERSE: "chart__bar--aubergine-mid-light",
INTERIM_RELEASE: "chart__bar--grey",
};

Expand Down
Loading

0 comments on commit 7508b69

Please sign in to comment.