diff --git a/package.json b/package.json index f706e893743..2f189f438a7 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "typescript": "4.5.4", "url-polyfill": "1.1.12", "url-search-params-polyfill": "8.1.1", - "vanilla-framework": "^3.13.0", + "vanilla-framework": "^3.14.0", "yup": "0.32.11" }, "resolutions": { diff --git a/static/sass/_pattern_lists.scss b/static/sass/_pattern_lists.scss index 97266a770cc..b4c6d130aa7 100644 --- a/static/sass/_pattern_lists.scss +++ b/static/sass/_pattern_lists.scss @@ -10,6 +10,7 @@ @include ubuntu-p-step-counter; @include ubuntu-p-list-ticked; @include ubuntu-p-list-horizontal-divided; + @include ubuntu-p-faq-stepped-list--detailed; } @mixin ubuntu-p-inline-list-icons { @@ -375,3 +376,31 @@ } } } + +@mixin ubuntu-p-faq-stepped-list--detailed { + .p-faq-stepped-list--detailed { + @extend .p-stepped-list--detailed; + + .p-faq-stepped-list__item { + @extend .p-stepped-list__item; + + padding-top: 0; + } + + @supports (display: grid) { + .p-faq-stepped-list__content { + @media (min-width: $threshold-6-12-col) { + display: flex; + grid-column-end: span 12; + margin-top: 0; + } + } + } + + // XXX : the accordion component needs to be fixed in vanilla. The issue was filed on https://github.com/canonical/vanilla-framework/issues/4563. This styles written locally needs to be removed after vanilla update. + .u-default-max-width { + display: inline-block; + max-width: $text-max-width; + } + } +} diff --git a/static/sass/styles.scss b/static/sass/styles.scss index e02b5c040bf..b6d1b1db5d5 100644 --- a/static/sass/styles.scss +++ b/static/sass/styles.scss @@ -1324,6 +1324,12 @@ hr.p-separator.is-shallow { aspect-ratio: 3/2; } +// XXX Pete +// Custom styles for paper background +.is-paper { + background: #f3f3f3; +} + .amd-xilinx-table { th:nth-child(2) { width: 65%; diff --git a/templates/user-research/base_user-research.html b/templates/user-research/base_user-research.html new file mode 100644 index 00000000000..4f0831473b3 --- /dev/null +++ b/templates/user-research/base_user-research.html @@ -0,0 +1,7 @@ +{% extends "templates/base.html" %} + +{% block meta_copydoc %}https://docs.google.com/document/d/1gOoOJNnrUVWOhpYlkShq0FAbMqDZsj-CXuOGT_S8Xl4/edit#heading=h.hfhqccyix5vw{% endblock meta_copydoc %} + +{% block outer_content %} + {% block content %}{% endblock %} +{% endblock %} diff --git a/templates/user-research/index.html b/templates/user-research/index.html new file mode 100644 index 00000000000..7962fb24b9a --- /dev/null +++ b/templates/user-research/index.html @@ -0,0 +1,231 @@ +{% extends "user-research/base_user-research.html" %} + +{% block meta_copydoc %}https://docs.google.com/document/d/1gOoOJNnrUVWOhpYlkShq0FAbMqDZsj-CXuOGT_S8Xl4/edit#heading=h.hfhqccyix5vw{% endblock meta_copydoc %} + +{% block title %}Canonical User Research Programme{% endblock %} + +{% block meta_description %}The Canonical User Research Programme offers our users the chance to collaborate with our design and engineering teams in the creation, improvement and evolution of our products. A short registration survey lets you sign up for the programme; you'll receive invitations to relevant user-research studies. {% endblock %} + +{% block content %} + +
+
+
+
+

Canonical
user research

+
+
+

Help make Canonical products better.
Share your thoughts and experiences.

+

You'll get early access to the products Canonical's engineers and designers are working on right now – we love to collaborate with users when creating new features and designs. Your insights will influence our direction, and everyone's user experience.

+

Join our User Research Program

+ {{ image ( + url="https://assets.ubuntu.com/v1/e549fdc0-Canonical-AI-ML-Illustrations-v5-03.png", + alt="", + width="1200", + height="898", + hi_def=True, + loading="auto" + ) | safe + }} +
+
+
+ +
+
+
+
+

Current studies

+
+
+

Navigating ubuntu.com

+

We want to understand how you navigate ubuntu.com, to improve our menus, and help you learn about our products more easily.

+

Join a navigation study

+
+
+
+
+
+

Ubuntu Security

+

We would love to learn how you manage your security and updates, and the way you use our CVE and security notices.

+

Help us improve security

+
+
+
+
+
+

Ubuntu Pro

+

Did you purchase Ubuntu Pro through a reseller program? Help us make it better suit your current needs.

+

Tell us how Ubuntu Pro works for you

+
+
+
+ +
+
+
+
+

How does it work?

+
+
+
+
+

1. Sign-up

+
+
+

Fill in a 5-minute registration survey,
to help us match you with the right studies.

+
+
+
+
+
+
+
+
+
+

2. Receive invites

+
+
+

We'll send you an invite when the appropriate study comes along. +

+
+
+
+
+
+
+
+
+
+

3. Take part

+
+
+

You can decide if you want to (remotely) participate. There's usually a choice of days and times for interviews – you may also get invitations to surveys.

+
+
+
+
+
+ +
+
+
+
+

FAQ

+
+
+
+
+

Do I need to be a Canonical customer to join?

+
+
+

No, you do not. Everyone is welcome!

+
+
+
+
+
+

Where can I be located?

+
+
+

You can be anywhere in the world. All our studies are conducted remotely.

+
+
+
+
+
+

What types of research do you do?

+
+
+

We do interviews, usability-tests, surveys, and more. We need your thoughts, to guide us in building better product-experiences.

+
+
+
+
+
+

What does participating look like?

+
+
+

Our 1:1 interview sessions are done remotely, and usually take 30-minutes to an hour. Typically you'll share your screen. Surveys only take a few minutes. Other tests may involve completing a task with a prototype and answering online questions.

+
+
+
+
+
+

How often will I be contacted?

+
+
+

Usually less than three times a year.

+
+
+
+
+
+

Will I receive something for participating?

+
+
+

When participating in some lengthy moderated sessions, such as 1-1 interviews or usability tests, we'll send you a thank you gift.

+
+
+
+
+
+

What will you do with my personal information?

+
+
+

Our data privacy policy defines how we collect the minimum amount of personal information necessary to match you with suitable research studies.

+
+
+
+
+
+

Can I leave the group?

+
+
+

Absolutely. Just email userresearch@canonical.com and we'll delete your info from our database.

+
+
+
+
+
+ +
+
+
+
+

Talk to us

+
+
+

We want to hear about your user experiences – what's working well, and what's not. Get in touch to tell us what you think, so we can improve Canonical's products and services for everyone.

+

User Research on Discourse

+
+
+
+ +
+
+
+
+

Our mission

+
+
+

Open source is collective power in action. The power of a worldwide community of highly skilled experts that build, share and improve the very latest software together – then make it available to everyone.

+ Learn more about our mission +
+
+
+ +
+
+
+
+

Any questions?

+
+
+

Write to us at
userresearch@canonical.com

+
+
+
+
+ +{% endblock content%} diff --git a/yarn.lock b/yarn.lock index 38bd139b19a..abd9b4fedaa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8578,7 +8578,7 @@ vanilla-framework@3.0.1: postcss-cli "9.1.0" sass "1.45.2" -vanilla-framework@^3.13.0: +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==