diff --git a/package.json b/package.json index 33928402280..2701255275c 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "watch-cli": "0.2.3" }, "dependencies": { - "@canonical/cookie-policy": "^3.4.0", + "@canonical/cookie-policy": "3.5.0", "@canonical/global-nav": "^2.7.0", "@canonical/latest-news": "1.4.1", "@canonical/react-components": "^0.38.0", @@ -115,7 +115,7 @@ "typescript": "4.5.4", "url-polyfill": "1.1.12", "url-search-params-polyfill": "8.1.1", - "vanilla-framework": "^3.14.0", + "vanilla-framework": "4.3.0", "yup": "0.32.11" }, "resolutions": { diff --git a/static/js/src/core.js b/static/js/src/core.js index d67517ac9aa..7701c7b5755 100755 --- a/static/js/src/core.js +++ b/static/js/src/core.js @@ -5,7 +5,7 @@ import { cookiePolicy } from "@canonical/cookie-policy"; createNav({ showLogins: false, hiring: "https://canonical.com/careers/start", - maxWidth: "72rem", + maxWidth: "80rem", }); // Initalise the cookie policy notification. diff --git a/static/sass/_layout-tutorial.scss b/static/sass/_layout-tutorial.scss index 848f30c4121..16542581810 100644 --- a/static/sass/_layout-tutorial.scss +++ b/static/sass/_layout-tutorial.scss @@ -41,9 +41,17 @@ } .l-tutorial__nav-title { + // recreate circle styling from Vanilla 3.0, to unblock Vanilla 4.0 migation + // FIXME: Vanilla 4.0 doesn't use circled steps, so this needs to be redesigned and updated, possibly to use standard side navigation &::before { + border: 1px solid $colors--light-theme--text-default; + border-radius: 50%; + content: counter(li); height: $sp-large; + // line height is calculated to vertically center the number, which is size of the circle minus the border + line-height: calc($sp-large - 2px); margin-right: $sp-medium; + text-align: center; width: $sp-large; } @@ -51,8 +59,8 @@ font-weight: 400; &::before { - background-color: $color-brand; - color: $color-x-light; + background-color: $colors--light-theme--text-default; + color: $colors--dark-theme--text-default; font-weight: 300; } } diff --git a/static/sass/styles.scss b/static/sass/styles.scss index 8c46536b704..55f141b32d4 100644 --- a/static/sass/styles.scss +++ b/static/sass/styles.scss @@ -1385,3 +1385,17 @@ $color-link-dark: #69c !default; width: auto; } } + +// XXX: @bartaz: this will be covered in Vanilla +// can be removed once https://github.com/canonical/vanilla-framework/issues/4875 is done and released +.p-logo-section.has-misaligned-images { + .p-logo-section__item { + margin-bottom: $spv--x-large; + } + + .p-logo-section__logo { + max-height: 5rem; + // make sure image aspect ratio is kept + object-fit: contain; + } +} diff --git a/templates/ai/index.html b/templates/ai/index.html index 7089364770c..54b360a7631 100644 --- a/templates/ai/index.html +++ b/templates/ai/index.html @@ -35,8 +35,8 @@

The best data science and MLops tools across your infra

-
-

Leaders in artificial intelligence choose Ubuntu

+

Leaders in artificial intelligence choose Ubuntu

+
{{ image ( @@ -99,7 +99,7 @@

Best of breed data science tools.

The most productive tools for AI / ML development, with guides and resources available.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/2842a636-tensor-flow-logo.svg", @@ -171,7 +171,7 @@

Deploy

Multi-framework model serving.

Effective model deployment across devices mesh. Low-latency inference serving.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/f988bb24-seldon-logo.svg", @@ -240,7 +240,7 @@

ML operations

Infrastructure for production data science.

Centralised or multi-cloud training infrastructure for better resource allocation and data governance.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/b730ace5-kubeflow-logo.svg", @@ -296,7 +296,7 @@

Data lake

Analyse epic amounts of data, wherever it is.

Build large-scale data lakes optimised for machine learning on bare metal, virtual or cloud infrastructure with open source.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/fabdefb7-kafka+logo.png", @@ -332,7 +332,7 @@

Hardware control

Drivers, storage, networking, CPU, GPU, DPU.

Enjoy full control over your firmware, in a safe environment, tested by millions.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/d2ed7c63-nvidia-logo.svg", @@ -388,7 +388,7 @@

Portable to scale

Give your workloads consistency everywhere.

Portable from desktop to vast multi-clouds. Fast-deploy on every major public cloud with GPU acceleration.

-
+
{{ image ( url="https://assets.ubuntu.com/v1/2f0c1694-server brand.svg", @@ -396,7 +396,8 @@

Give your workloads consistency everywhere.

width="158", height="158", hi_def=True, - loading="lazy" + loading="lazy", + attrs={"class": "p-logo-section__logo"} ) | safe }}
@@ -407,7 +408,8 @@

Give your workloads consistency everywhere.

width="159", height="158", hi_def=True, - loading="lazy" + loading="lazy", + attrs={"class": "p-logo-section__logo"} ) | safe }}
@@ -418,7 +420,8 @@

Give your workloads consistency everywhere.

width="159", height="158", hi_def=True, - loading="lazy" + loading="lazy", + attrs={"class": "p-logo-section__logo"} ) | safe }}
@@ -429,7 +432,8 @@

Give your workloads consistency everywhere.

width="158", height="158", hi_def=True, - loading="lazy" + loading="lazy", + attrs={"class": "p-logo-section__logo"} ) | safe }}
@@ -440,7 +444,8 @@

Give your workloads consistency everywhere.

width="158", height="158", hi_def=True, - loading="lazy" + loading="lazy", + attrs={"class": "p-logo-section__logo"} ) | safe }}
diff --git a/templates/ai/roadshow.html b/templates/ai/roadshow.html index 0146ad0c3ba..734d77fc945 100644 --- a/templates/ai/roadshow.html +++ b/templates/ai/roadshow.html @@ -33,7 +33,7 @@

Develop artificial intelligence projects
on any environment with Canonical

-
+
{{ image ( diff --git a/templates/ai/services.html b/templates/ai/services.html index dc11996dbaf..b11235d0afe 100644 --- a/templates/ai/services.html +++ b/templates/ai/services.html @@ -189,8 +189,8 @@

Join our network of partners

Become a partner

-
-
+
+
{{ image ( @@ -199,6 +199,7 @@

Join our network of partners

width="185", height="22", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -210,6 +211,7 @@

Join our network of partners

width="163", height="34", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -221,6 +223,7 @@

Join our network of partners

width="175", height="34", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/ai/what-is-kubeflow.html b/templates/ai/what-is-kubeflow.html index df943ed03bb..d740f6ff111 100644 --- a/templates/ai/what-is-kubeflow.html +++ b/templates/ai/what-is-kubeflow.html @@ -41,8 +41,8 @@

What is Kubeflow?

-
-

Contributors to Kubeflow

+

Contributors to Kubeflow

+
{{ @@ -162,7 +162,7 @@

What's inside Kubeflow?

-
+
{{ @@ -406,7 +406,7 @@

Who uses Kubeflow?

Forward-looking enterprises are using Kubeflow to empower their data scientists.

-
+
{{ diff --git a/templates/automotive/index.html b/templates/automotive/index.html index aac5fbc03a2..6c3ccc485c8 100644 --- a/templates/automotive/index.html +++ b/templates/automotive/index.html @@ -305,7 +305,7 @@

Top rated security. Best-in-class isolation

-
+
{{ image ( @@ -572,8 +572,8 @@

Build the dealerships of the future

+

Accelerating on Ubuntu

-

Accelerating on Ubuntu

{{ image ( diff --git a/templates/aws/index.html b/templates/aws/index.html index 4249a08c5a6..fcc973de864 100644 --- a/templates/aws/index.html +++ b/templates/aws/index.html @@ -32,8 +32,8 @@

Ubuntu on AWS

+

Ubuntu on AWS powers cloud leaders like

-

Ubuntu on AWS powers cloud leaders like

{{ image ( diff --git a/templates/azure/index.html b/templates/azure/index.html index 33c7e12b701..633e46f1d59 100644 --- a/templates/azure/index.html +++ b/templates/azure/index.html @@ -42,8 +42,8 @@

+

Ubuntu on Azure powers cloud leaders like

-

Ubuntu on Azure powers cloud leaders like

{{ image ( diff --git a/templates/azure/shared/_azure-logo-strip.html b/templates/azure/shared/_azure-logo-strip.html index fe8e6b0542a..bdfd65b726f 100644 --- a/templates/azure/shared/_azure-logo-strip.html +++ b/templates/azure/shared/_azure-logo-strip.html @@ -9,6 +9,7 @@ width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -20,6 +21,7 @@ width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -31,6 +33,7 @@ width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} diff --git a/templates/base_index.html b/templates/base_index.html index ae993c1914b..fbe88bdf660 100644 --- a/templates/base_index.html +++ b/templates/base_index.html @@ -57,18 +57,20 @@

Modern enterprise open source

-
-
- -
-
- -
-
- -
-
- +
+
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/templates/ceph/shared/_ceph-users.html b/templates/ceph/shared/_ceph-users.html index 5ede58441c6..a556bc18abd 100644 --- a/templates/ceph/shared/_ceph-users.html +++ b/templates/ceph/shared/_ceph-users.html @@ -5,10 +5,10 @@

Companies using Ceph

+

+ Notable Ceph users +

-

- Notable Ceph users -

{{ image ( diff --git a/templates/ceph/what-is-ceph.html b/templates/ceph/what-is-ceph.html index 40384d049c4..97a65debc59 100644 --- a/templates/ceph/what-is-ceph.html +++ b/templates/ceph/what-is-ceph.html @@ -177,8 +177,8 @@

-
-

Influential contributors to Ceph

+

Influential contributors to Ceph

+
{{ diff --git a/templates/cloud/public-cloud.html b/templates/cloud/public-cloud.html index 24955fa6770..00d2610f22f 100755 --- a/templates/cloud/public-cloud.html +++ b/templates/cloud/public-cloud.html @@ -120,7 +120,7 @@

Ready to get started?

-
+
{{ @@ -130,6 +130,7 @@

Ready to get started?

height="67", width="112", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -142,6 +143,7 @@

Ready to get started?

width="350", height="100", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto", ) | safe }} @@ -153,6 +155,7 @@

Ready to get started?

width="350", height="61", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/core/index.html b/templates/core/index.html index 9f84b59dccb..ae8466b25c9 100644 --- a/templates/core/index.html +++ b/templates/core/index.html @@ -85,7 +85,7 @@

Get to market fast with our strong ecosystem

-
+
{{ image ( @@ -94,6 +94,7 @@

Get to market fast with our strong ecosystem

width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto", ) | safe }} @@ -105,6 +106,7 @@

Get to market fast with our strong ecosystem

width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto", ) | safe }} @@ -116,6 +118,7 @@

Get to market fast with our strong ecosystem

width="288", height="288", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -127,6 +130,7 @@

Get to market fast with our strong ecosystem

width="128", height="50", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} diff --git a/templates/desktop/features.html b/templates/desktop/features.html index 2d4ab86f164..cd4d01c2f7a 100755 --- a/templates/desktop/features.html +++ b/templates/desktop/features.html @@ -276,7 +276,7 @@

Organise your photos

Edit and illustrate

Edit your photos or create professional illustrations and designs with tools like Gimp and Krita, available in the Ubuntu Software centre.

-
+
{{ diff --git a/templates/edge-computing/index.html b/templates/edge-computing/index.html index cf87c03367c..2e0a2179e60 100644 --- a/templates/edge-computing/index.html +++ b/templates/edge-computing/index.html @@ -276,8 +276,7 @@

Smart cities, utilities, and power grids

Integrate with the best hardware vendors

Ubuntu works with a number of hardware vendors specialised in edge computing server equipment. Contact us to discuss working with your preferred vendors.

-
-

+
{{ image ( diff --git a/templates/embedding/index.html b/templates/embedding/index.html index c7d5f0835e8..a08a7f90266 100644 --- a/templates/embedding/index.html +++ b/templates/embedding/index.html @@ -52,11 +52,11 @@

Build your products with Canonical

-
-
-

- Partners -

+
+

+ Partners +

+
{{ diff --git a/templates/financial-services/index.html b/templates/financial-services/index.html index 0b182e7f222..7446519d932 100755 --- a/templates/financial-services/index.html +++ b/templates/financial-services/index.html @@ -27,8 +27,8 @@

Finserv open source solutions

-
-

innovating on ubuntu with canonical

+

innovating on ubuntu with canonical

+
{{ image ( @@ -104,7 +104,7 @@

Drive business agility

Public cloud ›          Private cloud ›

-
+
{{ image ( @@ -323,7 +323,7 @@

Secure and compliant

security maintenance and support. Ubuntu ranks first for speed and quality of security fixes across the widest range of open source applications and infrastructure.

-
+
{{ image ( @@ -401,14 +401,14 @@

Regain focus on business priorities

Canonical offers fully managed open source with a disruptive business model - priced per host or VM, not by the hour or per application. Maintain business focus and reduce costs, and offload the complexity of deploying and managing open source components to our specialist team.

-
+
{{ image ( - url="https://assets.ubuntu.com/v1/82e5d34c-MySQL.png", + url="https://assets.ubuntu.com/v1/703b9461-apps_mysql.png", alt="MySQL", - width="90", - height="47", + width="144", + height="103", hi_def=True, loading="lazy", attrs={"class": "p-logo-section__logo"} @@ -576,7 +576,7 @@

Intelligent finance

machine learning processes with Kubeflow. With Ubuntu, you benefit from perfect multi-cloud portability of AI/ML workloads.

-
+
{{ image ( @@ -734,16 +734,4 @@

Innovate at lower cost with Canonical

- - {% endblock content %} diff --git a/templates/gov/index.html b/templates/gov/index.html index ff30d6079d4..c71e4bfb111 100644 --- a/templates/gov/index.html +++ b/templates/gov/index.html @@ -167,8 +167,8 @@

Ubuntu Partners

-
-

Public cloud

+

Public cloud

+
{{ @@ -229,8 +229,8 @@

Public cloud

-
-

Hardware partners

+

Hardware partners

+
{{ diff --git a/templates/hpc/index.html b/templates/hpc/index.html index afcbcb0e77c..fe371df00d9 100644 --- a/templates/hpc/index.html +++ b/templates/hpc/index.html @@ -32,8 +32,8 @@

HPC and supercomputing

+

Advancing high-performance workloads

-

Advancing high-performance workloads

{{ diff --git a/templates/hpc/use-cases.html b/templates/hpc/use-cases.html index 711a2a33a14..d51475661e3 100644 --- a/templates/hpc/use-cases.html +++ b/templates/hpc/use-cases.html @@ -24,8 +24,8 @@

High-performance computing use cases

+

Advancing high-performance workloads

-

ADVANCING HIGH-PERFORMANCE WORKLOADS

{{ image ( diff --git a/templates/hpe/index.html b/templates/hpe/index.html index 713186f94d1..eda76fa4060 100644 --- a/templates/hpe/index.html +++ b/templates/hpe/index.html @@ -160,7 +160,7 @@

Proven results from collaborative solutions

-
+
diff --git a/templates/industrial/index.html b/templates/industrial/index.html index c418f6f677a..59a316b96bf 100644 --- a/templates/industrial/index.html +++ b/templates/industrial/index.html @@ -44,7 +44,7 @@

Empowering industry 4.0 champions

-
+
@@ -204,7 +204,7 @@

Connected OT

  • App stores including OPC-UA, Modbus, MQTT clients and more
    • -
    +
    {{ image ( @@ -311,7 +311,7 @@

    Industrial micro clouds

  • Contract long term support services for mission critical software
    • -
    +
    {{ image ( @@ -380,7 +380,7 @@

    Shop floor cobots

  • Run deep learning inference engines, natively or in containers
    • -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/c1b1d4a9-ros-logo.png", @@ -454,7 +454,7 @@

    Exciting HMIs and POS

  • Create rich graphical interfaces with Qt and Flutter
    • -
    +
    {{ image ( diff --git a/templates/internet-of-things/appstore.html b/templates/internet-of-things/appstore.html index 9131cf52c1a..0b115f24993 100644 --- a/templates/internet-of-things/appstore.html +++ b/templates/internet-of-things/appstore.html @@ -67,8 +67,8 @@

    Enterprise-ready

    -
    -

    Read about the companies using app stores for IoT

    +

    Read about the companies using app stores for IoT

    +
    diff --git a/templates/internet-of-things/index.html b/templates/internet-of-things/index.html index c36ebd5ecc9..8e281e37ea3 100644 --- a/templates/internet-of-things/index.html +++ b/templates/internet-of-things/index.html @@ -281,44 +281,44 @@

    IoT professional services

    Ready–to–go gateway solutions

    For industrial and enterprise solutions, just add your apps and they'll handle the rest.

    -
    -
    -
    -
    - {{ - image( - url="https://assets.ubuntu.com/v1/5ddba83a-logo-dell.svg", - alt="Dell", - width="88", - height="88", - hi_def=True, - attrs={"class": "p-logo-section__logo"}, - ) | safe - }} -
    -
    - {{ - image( - url="https://assets.ubuntu.com/v1/c95e6028-rigado-logo.png", - alt="Rigado", - width="130", - height="80", - hi_def=True, - attrs={"class": "p-logo-section__logo", "style": "max-width: 140px; max-height: 140px;"}, - ) | safe - }} -
    -
    - {{ +
    +
    +
    + {{ image( - url="https://assets.ubuntu.com/v1/582bee22-avantech-logo.png", - alt="Avantech", - width="170", - height="48", + url="https://assets.ubuntu.com/v1/5ddba83a-logo-dell.svg", + alt="Dell", + width="88", + height="88", hi_def=True, attrs={"class": "p-logo-section__logo"}, ) | safe - }} + }} +
    +
    + {{ + image( + url="https://assets.ubuntu.com/v1/c95e6028-rigado-logo.png", + alt="Rigado", + width="130", + height="80", + hi_def=True, + attrs={"class": "p-logo-section__logo", "style": "max-width: 140px; max-height: 140px;"}, + ) | safe + }} +
    +
    + {{ + image( + url="https://assets.ubuntu.com/v1/582bee22-avantech-logo.png", + alt="Avantech", + width="170", + height="48", + hi_def=True, + attrs={"class": "p-logo-section__logo"}, + ) | safe + }} +
    diff --git a/templates/internet-of-things/smart-city.html b/templates/internet-of-things/smart-city.html index db5e14c4460..2400374d0d9 100644 --- a/templates/internet-of-things/smart-city.html +++ b/templates/internet-of-things/smart-city.html @@ -31,8 +31,8 @@

    Build the future with smart cities

    -
    -

    Trusted by leading service providers, globally

    +

    Trusted by leading service providers, globally

    +
    {{ image ( @@ -356,7 +356,7 @@

    IoT OTA updates

    -
    +
    {{ image ( diff --git a/templates/kubernetes/index.html b/templates/kubernetes/index.html index 5cbed5eb6ef..b749684c19f 100644 --- a/templates/kubernetes/index.html +++ b/templates/kubernetes/index.html @@ -78,7 +78,7 @@

    Public cloud Kubernetes powered by Ubuntu

  • In-cloud Ubuntu package mirrors for high bandwidth and local updates
  • Full control over kernel security patching with Canonical Livepatch
    • -
    +
    {{ @@ -98,8 +98,8 @@

    Public cloud Kubernetes powered by Ubuntu

    image( url="https://assets.ubuntu.com/v1/a82add58-profile-aws.svg", alt="AWS", - width="88", - height="52", + width="186", + height="104", hi_def=True, loading="lazy", attrs={"class": "p-logo-section__logo"}, @@ -111,8 +111,8 @@

    Public cloud Kubernetes powered by Ubuntu

    image( url="https://assets.ubuntu.com/v1/6e176d9a-Google+Cloud+stacked.svg", alt="Google Cloud Platform", - width="104", - height="86", + width="208", + height="172", hi_def=True, loading="lazy", attrs={"class": "p-logo-section__logo"}, @@ -264,8 +264,8 @@

    Canonical Kubernetes benefits

    +

    Fully-support Kubernetes clouds

    -

    Fully-support Kubernetes clouds

    @@ -567,9 +567,9 @@

    Integrated cluster management platforms

  • GitOps at scale for application management and configuration
  • Flexibility across environments from public cloud to edge
    • -
    +
    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/017e0818-rancher-logo.png", alt="Rancher", @@ -581,7 +581,7 @@

    Integrated cluster management platforms

    ) | safe }}
    -
    +
    {{ image( url="https://assets.ubuntu.com/v1/c767b383-Portainer+Logo.svg", @@ -594,7 +594,7 @@

    Integrated cluster management platforms

    ) | safe }}
    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/717291f2-download.png", alt="", @@ -606,7 +606,7 @@

    Integrated cluster management platforms

    ) | safe }}
    -
    +
    {{ image ( url="https://assets.ubuntu.com/v1/96712e22-AzureArcLarge.svg", alt="", diff --git a/templates/kubernetes/managed.html b/templates/kubernetes/managed.html index 2c98be9e0fc..8e6471fef27 100644 --- a/templates/kubernetes/managed.html +++ b/templates/kubernetes/managed.html @@ -65,10 +65,10 @@

    +

    + They trust us to run their K8s +

    -

    - They trust us to run their K8s -

    {{ image ( @@ -247,10 +247,10 @@

    Multi–cloud ready

    +

    + Supported clouds +

    -

    - Supported clouds -

    {{ image ( diff --git a/templates/kubernetes/what-is-kubernetes.html b/templates/kubernetes/what-is-kubernetes.html index 565928e51d4..0e0c5889f77 100644 --- a/templates/kubernetes/what-is-kubernetes.html +++ b/templates/kubernetes/what-is-kubernetes.html @@ -298,8 +298,8 @@

    -
    -

    Key contributors to Kubernetes

    +

    Key contributors to Kubernetes

    +
    {{ @@ -385,7 +385,7 @@

    Key contributors to Kubernetes height="40", width="169", hi_def=True, - attrs={"class": "p-logo-section__logo", "style": "width:169px;"}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -398,7 +398,7 @@

    Key contributors to Kubernetes height="30", width="270", hi_def=True, - attrs={"class": "p-logo-section__logo", "style": "width:270px;"}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} diff --git a/templates/landscape/index.html b/templates/landscape/index.html index e985f09072f..9bbecdbef15 100644 --- a/templates/landscape/index.html +++ b/templates/landscape/index.html @@ -167,10 +167,10 @@

    Landscape is available through Ubuntu Pro

    -
    -

    - A selection of Ubuntu Pro customers -

    +

    + A selection of Ubuntu Pro customers +

    +
    {{ @@ -224,8 +224,6 @@

    Landscape is available through Ubuntu Pro

    ) | safe }}
    -
    -
    {{ image ( diff --git a/templates/managed/apps/_managed-apps-logo-section.html b/templates/managed/apps/_managed-apps-logo-section.html index e6840596852..c6b12ab1ea5 100644 --- a/templates/managed/apps/_managed-apps-logo-section.html +++ b/templates/managed/apps/_managed-apps-logo-section.html @@ -1,8 +1,8 @@
    +

    Managed on:

    -

    Managed on:

    {{ image ( diff --git a/templates/managed/apps/index.html b/templates/managed/apps/index.html index f8bc7895885..332a4e47760 100644 --- a/templates/managed/apps/index.html +++ b/templates/managed/apps/index.html @@ -250,8 +250,8 @@

    Security and certifications

    +

    Run your apps anywhere

    -

    Run your apps anywhere

    {{ diff --git a/templates/managed/index.html b/templates/managed/index.html index 804e01c9e01..797ddeb5fb6 100644 --- a/templates/managed/index.html +++ b/templates/managed/index.html @@ -39,8 +39,8 @@

    Managed IT Services

    -
    -

    We manage clouds for world leaders

    +

    We manage clouds for world leaders

    +
    {{ image ( diff --git a/templates/nvidia/index.html b/templates/nvidia/index.html index 0e1cd04b1d1..a0bbeeff497 100644 --- a/templates/nvidia/index.html +++ b/templates/nvidia/index.html @@ -391,25 +391,25 @@

    Software defined operations

    - {{ - image ( + {{ image ( url="https://assets.ubuntu.com/v1/70b45d0a-kubernetes-logomark-logo.png", alt="", width="288", height="289", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    - {{ - image ( + {{ image ( url="https://assets.ubuntu.com/v1/5a3b2944-Openstack-logo-2021.svg", alt="", width="144", height="144", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -422,6 +422,7 @@

    Software defined operations

    width="289", height="289", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -434,6 +435,7 @@

    Software defined operations

    width="289", height="289", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -446,6 +448,7 @@

    Software defined operations

    width="289", height="289", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -457,6 +460,7 @@

    Software defined operations

    width="288", height="289", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/observability/index.html b/templates/observability/index.html index 82d13e3b617..9c97f788e77 100644 --- a/templates/observability/index.html +++ b/templates/observability/index.html @@ -214,8 +214,8 @@

    Dashboards and Alerting

    +

    Trusted by

    -

    Trusted by

    {{ image ( @@ -224,6 +224,7 @@

    Dashboards and Alerting

    width="144", height="144", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -235,6 +236,7 @@

    Dashboards and Alerting

    width="292", height="290", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -246,6 +248,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -257,6 +260,7 @@

    Dashboards and Alerting

    width="146", height="146", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -268,6 +272,7 @@

    Dashboards and Alerting

    width="144", height="144", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -279,6 +284,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -290,6 +296,7 @@

    Dashboards and Alerting

    width="144", height="144", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -301,6 +308,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -312,6 +320,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -323,6 +332,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -334,6 +344,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -345,6 +356,7 @@

    Dashboards and Alerting

    width="145", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/observability/managed.html b/templates/observability/managed.html index 8d77f105d35..d25fa993922 100644 --- a/templates/observability/managed.html +++ b/templates/observability/managed.html @@ -40,8 +40,8 @@

    You focus on your business, we run the monitoring tools
    -
    -

    WE MANAGE CLOUDS FOR WORLD LEADERS

    +

    We manage clouds for leaders

    +
    {{ diff --git a/templates/openstack/consulting.html b/templates/openstack/consulting.html index b2e864c9f95..089961a0283 100644 --- a/templates/openstack/consulting.html +++ b/templates/openstack/consulting.html @@ -29,9 +29,8 @@

    Accelerate your time-to-market with Private Cloud Build
    -
    -

    Deployed openstack with Canonical -

    +

    Deployed openstack with Canonical

    +
    {{ image ( @@ -41,7 +40,7 @@

    Accelerate your time-to-market with Private Cloud Build height="80", hi_def=True, loading="lazy", - attrs={"class": "logo-section__logo"} + attrs={"class": "p-logo-section__logo"} ) | safe }}

    @@ -53,7 +52,7 @@

    Accelerate your time-to-market with Private Cloud Build height="36", hi_def=True, loading="lazy", - attrs={"class": "logo-section__logo"} + attrs={"class": "p-logo-section__logo"} ) | safe }}

    @@ -65,7 +64,7 @@

    Accelerate your time-to-market with Private Cloud Build height="47", hi_def=True, loading="lazy", - attrs={"class": "logo-section__logo"} + attrs={"class": "p-logo-section__logo"} ) | safe }}

    @@ -77,7 +76,7 @@

    Accelerate your time-to-market with Private Cloud Build height="187", hi_def=True, loading="lazy", - attrs={"class": "logo-section__logo"} + attrs={"class": "p-logo-section__logo"} ) | safe }}

    @@ -101,7 +100,7 @@

    Accelerate your time-to-market with Private Cloud Build height="917", hi_def=True, loading="lazy", - attrs={"class": "logo-section__logo"} + attrs={"class": "p-logo-section__logo"} ) | safe }}

    diff --git a/templates/openstack/features.html b/templates/openstack/features.html index d31cf29c6a5..a0cf5096ea1 100644 --- a/templates/openstack/features.html +++ b/templates/openstack/features.html @@ -627,7 +627,7 @@

    Security and compliance

    Read a whitepaper about private cloud security ›

    -
    +
    {{ image ( diff --git a/templates/openstack/index.html b/templates/openstack/index.html index 23369c99faa..f0956606ba2 100644 --- a/templates/openstack/index.html +++ b/templates/openstack/index.html @@ -114,8 +114,8 @@

    Canonical OpenStack

    -
    -

    Proven record of success

    +

    Proven record of success

    +
    {{ image ( @@ -300,8 +300,8 @@

    Canonical OpenStack

    -

    Telcos, financial institutions, hardware manufacturers, government institutions, enterprises.

    -

    OpenStack and Ubuntu help you optimise infrastructure costs across all market sectors all over the world.

    +

    Telcos, financial institutions, hardware manufacturers, government institutions, enterprises.

    +

    OpenStack and Ubuntu help you optimise infrastructure costs across all market sectors all over the world.

    diff --git a/templates/openstack/managed.html b/templates/openstack/managed.html index 1ddfb089894..3f52c7b50ff 100755 --- a/templates/openstack/managed.html +++ b/templates/openstack/managed.html @@ -18,8 +18,8 @@

    Cut your infrastructure costs with Managed OpenStack
    -
    -

    Advancing on managed OpenStack

    +

    Advancing on managed OpenStack

    +
    {{ diff --git a/templates/openstack/shared/_openstack_clients.html b/templates/openstack/shared/_openstack_clients.html index 382e1f6b3a8..6385fc80c7b 100644 --- a/templates/openstack/shared/_openstack_clients.html +++ b/templates/openstack/shared/_openstack_clients.html @@ -1,6 +1,6 @@
    -
    -

    {{ heading }}

    +

    {{ heading }}

    +
    {{ diff --git a/templates/openstack/support.html b/templates/openstack/support.html index 78bc60ed5d5..07913d746f1 100644 --- a/templates/openstack/support.html +++ b/templates/openstack/support.html @@ -20,8 +20,8 @@

    OpenStack support

    -
    -

    With enterprise support from Canonical

    +

    With enterprise support from Canonical

    +
    {{ @@ -31,6 +31,7 @@

    OpenStack support

    width="158", height="158", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -43,6 +44,7 @@

    OpenStack support

    width="158", height="158", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -55,6 +57,7 @@

    OpenStack support

    width="158", height="158", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -67,6 +70,7 @@

    OpenStack support

    width="158", height="158", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} @@ -79,6 +83,7 @@

    OpenStack support

    width="165", height="40", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="auto" ) | safe }} diff --git a/templates/openstack/what-is-openstack.html b/templates/openstack/what-is-openstack.html index f48422b2b32..e04d14ae0a5 100644 --- a/templates/openstack/what-is-openstack.html +++ b/templates/openstack/what-is-openstack.html @@ -267,65 +267,65 @@

    Companies involved in OpenStack

    {{ image ( url="https://assets.ubuntu.com/v1/4b049910-canonical.svg", - alt="", width="145", height="145", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/9b1fe97b-2018-logo-IBM.svg", alt="", - width="145", height="145", hi_def=True, loading="lazy" ) | safe }} + width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/64277a51-2018-logo-redhat.svg", - alt="", width="145", height="145", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/362c1d2f-mirantis-logo.png", - alt="", width="145", height="145", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/50aef2d0-rackspace-logo.svg", alt="", - width="145", height="144", hi_def=True, loading="lazy" ) | safe }} + width="145", height="144", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/15263218-hewlett_packard.svg", alt="", - width="146", height="145", hi_def=True, loading="lazy" ) | safe }} + width="146", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/67f81bfe-intel-new-logo.png", alt="", - width="146", height="145", hi_def=True, loading="lazy" ) | safe }} + width="146", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/7dd7bfaf-2018-logo-huawei.svg", - alt="", width="145", height="145", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/446d9353-logo-nec.svg", - alt="", width="144", height="144", hi_def=True, loading="lazy" ) | safe + alt="", width="144", height="144", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/2ec61a24-logo-deutsche-telekom.svg", - alt="", width="144", height="144", hi_def=True, loading="lazy" ) | safe + alt="", width="144", height="144", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/bc0dcda4-vmware-logo.svg", - alt="", width="145", height="144", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="144", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    {{ image ( url="https://assets.ubuntu.com/v1/d8f890fb-logo-at%26t.svg", - alt="", width="145", height="145", hi_def=True, loading="lazy" ) | safe + alt="", width="145", height="145", hi_def=True, attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}
    diff --git a/templates/pro/index.html b/templates/pro/index.html index dd4d39d7fea..5f8a65c4528 100644 --- a/templates/pro/index.html +++ b/templates/pro/index.html @@ -128,7 +128,6 @@

    Security coverage compared

    {{ image ( url="https://assets.ubuntu.com/v1/8b428ac2-php+logo.png", alt="P H P", - attrs={"class":"p-logo-section__logo"}, width="280", height="280", hi_def=False, diff --git a/templates/robotics/index.html b/templates/robotics/index.html index 824b993dcac..097c146d19c 100644 --- a/templates/robotics/index.html +++ b/templates/robotics/index.html @@ -47,8 +47,8 @@

    Ubuntu is all your robot needs

    -
    -

    Building the future with

    +

    Building the future with

    +
    {{ diff --git a/templates/robotics/ros-esm.html b/templates/robotics/ros-esm.html index acabdf71f91..5d87db8159a 100644 --- a/templates/robotics/ros-esm.html +++ b/templates/robotics/ros-esm.html @@ -104,13 +104,13 @@

    ROS distributions available today in ROS ESM:

    - + Kinetic
    - + Melodic
    - + Foxy
    @@ -118,35 +118,35 @@

    ROS distributions available today in ROS ESM:

    +

    + A few of the 23,000 packages included in Ubuntu Universe: +

    -

    - A few of the 23,000 packages included in Ubuntu Universe: -

    -
    -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - -
    -
    - +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    +
    + +
    @@ -155,11 +155,11 @@

    ROS distributions available today in ROS ESM:

    +

    + A few of the 2,300 packages included in Ubuntu Main: +

    -

    - A few of the 2,300 packages included in Ubuntu Main: -

    -
    +
    diff --git a/templates/robotics/what-is-ros.html b/templates/robotics/what-is-ros.html index efaddd8a5c6..5b0f34fc296 100644 --- a/templates/robotics/what-is-ros.html +++ b/templates/robotics/what-is-ros.html @@ -100,8 +100,8 @@

    Who uses ROS?

    These are some of the companies openly using ROS today and the list only grows and diversifies as time progresses.

    -
    -
    +
    +
    {{ image( @@ -110,7 +110,7 @@

    Who uses ROS?

    height="35", width="90", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -123,7 +123,7 @@

    Who uses ROS?

    height="40", width="80", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -136,7 +136,7 @@

    Who uses ROS?

    height="47", width="100", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -149,7 +149,7 @@

    Who uses ROS?

    height="36", width="100", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -162,7 +162,7 @@

    Who uses ROS?

    height="28", width="100", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -175,7 +175,7 @@

    Who uses ROS?

    height="20", width="100", hi_def=True, - attrs={"class": ""}, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} diff --git a/templates/security/index.html b/templates/security/index.html index 3ac684a9d07..8e9ae112b1a 100644 --- a/templates/security/index.html +++ b/templates/security/index.html @@ -207,8 +207,8 @@

    Secure snap packages

    -
    -

    Ubuntu is trusted by

    +

    Ubuntu is trusted by

    +
    {{ diff --git a/templates/security/livepatch.html b/templates/security/livepatch.html index f6ed586c2da..f51abac5ba1 100644 --- a/templates/security/livepatch.html +++ b/templates/security/livepatch.html @@ -169,10 +169,10 @@

    Livepatch on-prem overview

    +

    + Livepatch is used by +

    -

    - Livepatch is used by -

    {{ diff --git a/templates/server/index.html b/templates/server/index.html index 46fca8bea72..67c1db0bc86 100755 --- a/templates/server/index.html +++ b/templates/server/index.html @@ -71,8 +71,8 @@

    Performance and versatility

    +

    Works with all your hardware and software

    -

    Works with all your hardware and software

    {{ image ( @@ -172,7 +172,7 @@

    Works with all your hardware a

    -

    View all certified hardware partners ›

    +

    View all certified hardware partners ›

    @@ -225,7 +225,7 @@

    Works with all your hardware a

    -

    +

    View all certified software partners ›

    diff --git a/templates/shared/_partner-logos.html b/templates/shared/_partner-logos.html index aefd95a665c..1272dd739a6 100644 --- a/templates/shared/_partner-logos.html +++ b/templates/shared/_partner-logos.html @@ -8,8 +8,8 @@
    {% else %} + {% if title %}

    {{title}}

    {% endif %}
    - {% if title %}

    {{title}}

    {% endif %}
    {% for partner in partners %} diff --git a/templates/support/index.html b/templates/support/index.html index 251dd9d4a56..70adaab2fcf 100755 --- a/templates/support/index.html +++ b/templates/support/index.html @@ -35,7 +35,7 @@

    Security, support and managed open source for enterpris

    -
    +
    diff --git a/templates/telco/index.html b/templates/telco/index.html index 1aedf4b06ce..ed722d2c4b6 100644 --- a/templates/telco/index.html +++ b/templates/telco/index.html @@ -215,9 +215,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant

    Read more ›

    -

    -
    -
    +
    {{ image ( @@ -226,6 +224,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="396", height="127", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -237,6 +236,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="1500", height="643", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -270,6 +270,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="78", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -281,6 +282,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="356", height="60", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -292,6 +294,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="67", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -303,6 +306,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="79", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -314,6 +318,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="407", height="147", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -330,10 +335,10 @@

    Security, support and managed open source for enterprises with Ubuntu Advant
    -
    -

    - Programs we are proud to be part of: -

    +

    + Programs we are proud to be part of: +

    +
    {{ image ( @@ -342,6 +347,7 @@

    width="112", height="34", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -353,6 +359,7 @@

    width="1582", height="343", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -364,6 +371,7 @@

    width="71", height="59", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -375,6 +383,7 @@

    width="137", height="46", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -386,6 +395,7 @@

    width="1500", height="643", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -419,6 +429,7 @@

    width="300", height="145", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -430,6 +441,7 @@

    width="396", height="127", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -441,6 +453,7 @@

    width="300", height="108", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -452,17 +465,19 @@

    width="150", height="150", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }}

    {{ image ( - url="https://assets.ubuntu.com/v1/5fe74a5b-logo-juju.svg", + url="https://assets.ubuntu.com/v1/48a8eddf-juju_black-orange_hex.svg", alt="", - width="102", - height="110", + width="407", + height="147", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/telco/magma.html b/templates/telco/magma.html index beb10f0fb0b..6baa5b92505 100644 --- a/templates/telco/magma.html +++ b/templates/telco/magma.html @@ -179,9 +179,8 @@

    Security, support and managed open source for enterprises with Ubuntu Advant

    Read more ›

    -

    -
    -
    + +
    {{ image ( @@ -190,6 +189,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="396", height="127", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -201,6 +201,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="1500", height="643", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -212,6 +213,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="108", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -223,6 +225,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="150", height="150", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -234,6 +237,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="78", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -245,6 +249,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="356", height="60", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -256,6 +261,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="67", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -267,6 +273,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="79", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -278,6 +285,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="407", height="147", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/telco/openran.html b/templates/telco/openran.html index 687082fee09..dce49bc90a8 100644 --- a/templates/telco/openran.html +++ b/templates/telco/openran.html @@ -172,9 +172,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant

    Read more ›

    -

    -
    -
    +
    {{ image ( @@ -183,6 +181,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="396", height="127", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -194,6 +193,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="1500", height="643", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -205,6 +205,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="108", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -216,6 +217,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="150", height="150", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -227,6 +229,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="78", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -238,6 +241,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="356", height="60", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -249,6 +253,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="67", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -260,6 +265,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="300", height="79", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} @@ -271,6 +277,7 @@

    Security, support and managed open source for enterprises with Ubuntu Advant width="407", height="147", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy" ) | safe }} diff --git a/templates/telco/shared/_telco-logo-section.html b/templates/telco/shared/_telco-logo-section.html index 9dab394a52e..7f8aa12f532 100644 --- a/templates/telco/shared/_telco-logo-section.html +++ b/templates/telco/shared/_telco-logo-section.html @@ -1,7 +1,7 @@ -
    -

    - Trusted by leading service providers, globally -

    +

    + Trusted by leading service providers, globally +

    +
    {{ @@ -11,6 +11,7 @@

    height="120", width="120", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -23,6 +24,7 @@

    height="55", width="83", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -35,6 +37,7 @@

    height="33", width="97", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -47,6 +50,7 @@

    height="160", width="160", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -59,6 +63,7 @@

    height="29", width="130", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -68,9 +73,10 @@

    image( url="https://assets.ubuntu.com/v1/7c97efb0-BT_logo.svg", alt="BT", - height="64", - width="64", + height="150", + width="150", hi_def=True, + attrs={"class": "p-logo-section__logo", "style": "padding: 1rem;"}, loading="lazy", ) | safe }} @@ -83,6 +89,7 @@

    height="75", width="100", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -95,6 +102,7 @@

    height="30", width="80", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -107,6 +115,7 @@

    height="40", width="100", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -119,6 +128,7 @@

    height="50", width="144", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -131,6 +141,7 @@

    height="28", width="100", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -143,6 +154,7 @@

    height="27", width="100", hi_def=True, + attrs={"class": "p-logo-section__logo"}, loading="lazy", ) | safe }} @@ -155,7 +167,7 @@

    height="70", hi_def=True, loading="lazy", - attrs={"style": "padding: 35px 0"} + attrs={"class": "p-logo-section__logo"}, ) | safe }}

    diff --git a/yarn.lock b/yarn.lock index f2ee3437f03..266d21e99c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1074,10 +1074,10 @@ resolved "https://registry.npmjs.org/@canonical/cookie-policy/-/cookie-policy-3.3.0.tgz" integrity sha512-G4u2dr04t138BoIsdbnVsL5i2vBl3supgqkAG03AfvAIbbkt1QlIlodGtrv0s3sczmUTEiSNfmT3iC70GY0Suw== -"@canonical/cookie-policy@^3.4.0": - version "3.4.0" - resolved "https://registry.npmjs.org/@canonical/cookie-policy/-/cookie-policy-3.4.0.tgz" - integrity sha512-cdVqxQmGu+j+Q86UobihWWVFzGzHlekFeMFxlbRpm+yqxEOUCrLkA9/t/RsMfLNDToP2ECPgsMbS20aPlA2tIg== +"@canonical/cookie-policy@3.5.0": + version "3.5.0" + resolved "https://registry.yarnpkg.com/@canonical/cookie-policy/-/cookie-policy-3.5.0.tgz#1c7e6cc2d5a7218375001b2cff2996a927693e89" + integrity sha512-XLCIl8+h+3BRfvqADqFsmAfWdaDGDchY/TPCKtpeQdb4r64SR6arsdNftlOb7vX8EuLCK2QRp6evUy0J+qnQTg== "@canonical/global-nav@^2.7.0": version "2.7.0" @@ -8618,10 +8618,10 @@ vanilla-framework@3.0.1: postcss-cli "9.1.0" sass "1.45.2" -vanilla-framework@^3.14.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-3.14.0.tgz#c5b94d7e2e3ef2d3c9f24091b7efc4abf8054cf9" - integrity sha512-06Vr2nhjU72N9IivwCLcd7FgqFNopkiHfzANJUCNdvs8FkbTjIB7fcsFgJ6O76KnOBsEiAoJAssRkTh9x3a2jw== +vanilla-framework@4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/vanilla-framework/-/vanilla-framework-4.3.0.tgz#44850ba1e568646bd1144de25628f63758d749ce" + integrity sha512-CDFgUX7MMp3ZJoiE8nif/uSPD3YPaK0lWm8iru9tgIO/SloWzkGvG2G5NPllDnwF4cMMi7YxsK/ylz7mH7OgZA== verbalize@^0.1.2: version "0.1.2"