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.

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

feat: sd 259470 #943

Merged
merged 4 commits into from
Aug 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "wmn-design-system",
"version": "2.4.0",
"description": "A library of typography, visual styles and user interface components which are documented for Transport for West Midlands.",
"homepage": "https://designsystem.wmnetwork.co.uk",
"homepage": "https://designsystem.tfwm.org.uk/",
"author": "WMCA",
"main": "build/index.html",
"files": [
Expand Down
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/Colour.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/Colour@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/Colour@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/White text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/White.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/White@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Landscape/White@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/Colour.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/Colour@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/Colour@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/White text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/White text@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/White.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/White@2x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/wmnds/assets/img/logos/WM Walking/Portrait/White@3x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/wmnds/assets/old/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Don't delete anything in this folder as it is used to store compiled assets used
## When to delete?

This folder can deleted when all internal services point to the versioned links of the design system hosted on unpkg.
There is also a third-party platform (Swift) which use the legacy links (an example of the legacy CSS link that we still support: https://designsystem.wmnetwork.co.uk/css/wmnds-components.min.css).
There is also a third-party platform (Swift) which use the legacy links (an example of the legacy CSS link that we still support: https://designsystem.tfwm.org.uk/css/wmnds-components.min.css).
2 changes: 1 addition & 1 deletion src/wmnds/components/content-card/_example.njk
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{{
wmndsContentCard({
id: null,
link: "https://designsystem.wmnetwork.co.uk/components/content-card/",
link: "https://designsystem.tfwm.org.uk/components/content-card/",
linkTitle: "Content Card Component",
classes: null,
yellow: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,23 @@
{% elif mode == "eScooter" %}
{% set _logoFolder = "WM eScooter" %}
{% set _logoAlt = "West Midlands eScooter" %}
{% elif mode == "cyclewalk" %}
{% set _logoFolder = "WM Cycle + Walk" %}
{% set _logoAlt = "West Midlands eScooter" %}
{% set _modeClass = " wmnds-travel-mode-page-banner--cycle" | lower if mode %} {# Set correct modifier class #}
{% else %}
{# If no mode is selected(or is bus), then default to bus #}
{% set _logoFolder = "WM Bus" %}
{% set _logoAlt = "West Midlands Bus" %}
{% set mode = "bus" %} {# Fallback for mode #}
{% set _modeClass = " wmnds-travel-mode-page-banner--" + mode | lower if mode %} {# Set correct modifier class #}
{% endif %}

{# These variables are set after the if statement to make sure we get the fallback mode: bus if the user hasn't selected a mode or misstyped the mode param #}
{% set _logo = "https://designsystem.wmnetwork.co.uk/img/logos/" + _logoFolder + "/Landscape/White.png" %} {# Set logo to the correct one based on if statements above. Set to designsystem.wmnetwork.co.uk so anyone using prototype kit or using via npm can use our logos #}
{% set _logo = "https://designsystem.tfwm.org.uk/img/logos/" + _logoFolder + "/Landscape/White.png" %} {# Set logo to the correct one based on if statements above. Set to designsystem.tfwm.org.uk so anyone using prototype kit or using via npm can use our logos #}
{% set title = params.title if params.title else mode | capitalize + " in the West Midlands" %} {# Set title else fallback to "mode in West Midlands") #}
{% set contentHTML = params.contentHTML | safe if params.contentHTML else null %}
{% set image = params.image if params.image else "/img/component-images/banner/bus-banner-img.png" %}
{% set _modeClass = " wmnds-travel-mode-page-banner--" + mode | lower if mode %} {# Set correct modifier class #}

<div class="wmnds-travel-mode-page-banner{{_modeClass}}">
<div class="wmnds-container">
Expand All @@ -48,13 +52,25 @@
{% endif %}
</div>
<div class="wmnds-travel-mode-page-banner__logos">
{% if mode %}
{% if mode != "cyclewalk" %}
{{
wmndsIcon({
icon: "modes-bg-" + mode
})
}}
{% endif %}
{% if mode == "cyclewalk" %}
{{
wmndsIcon({
icon: "modes-bg-cycle"
})
}}
{{
wmndsIcon({
icon: "modes-bg-walk"
})
}}
{% endif %}
{% if _logo %}
<img src="{{_logo}}" alt="{{_logoAlt}}">
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion src/www/_partials/_head.njk
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{# Set vars #}
{% set title = "Transport for West Midlands Design System" if section == "Home" else (pageTitle | striptags + " – Transport for West Midlands Design System") %} {# If homepage, else any other pages #}
{% set description = "A design system to help your service look and feel like Transport for West Midlands." %} {# Description of website #}
{% set urlToShare = "https://designsystem.wmnetwork.co.uk/" %} {# URL of website to share in meta data #}
{% set urlToShare = "https://designsystem.tfwm.org.uk/" %} {# URL of website to share in meta data #}
{% set imgToShare = "/config/tfwm-share.png" %} {# Image to share in meta data #}
{% set faviconsDir = "/config/favicons/" %} {# Path to favicons dir, used in meta data #}

Expand Down
Loading
Loading