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

Release #75

Merged
merged 22 commits into from
Jan 7, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
84e2be4
components update
chr1se Dec 9, 2020
2f18854
components update
chr1se Dec 9, 2020
99d3416
update: brand guidelines link
rolorogan Dec 9, 2020
25c48b9
Merge pull request #44 from wmcadigital/nr/feature/images
rolorogan Dec 9, 2020
f86b1d6
added last few components
chr1se Dec 17, 2020
5c1f15f
coomit after pull
chr1se Dec 17, 2020
67bd43f
update: shields
rolorogan Dec 17, 2020
468d4d5
update: ds preview image
rolorogan Dec 17, 2020
4dc4638
update: cdn links with version
rolorogan Dec 17, 2020
68b1ae8
Merge pull request #62 from wmcadigital/ds1.1.2
rolorogan Dec 17, 2020
f1e7b71
update: banner bg colour to transparent
rolorogan Dec 17, 2020
aa30b06
update: remove header v2 and cards from patterns
rolorogan Dec 17, 2020
6fd1aec
remove: custom accordion
rolorogan Dec 17, 2020
32316f4
update: make table bg transparent
rolorogan Dec 17, 2020
8362ab4
update: dropdown arrow data:image
rolorogan Dec 17, 2020
cd83dbf
Merge pull request #63 from wmcadigital/nr/feat/readme-badges
rolorogan Dec 17, 2020
c478b6d
Merge pull request #64 from wmcadigital/nr/fix/styling-amends
rolorogan Dec 17, 2020
64f7c27
Merge pull request #65 from wmcadigital/ds1.1
rolorogan Dec 17, 2020
af9eeaa
Revert "feat: Ds1.1 - Design System Updates"
rolorogan Dec 17, 2020
6d950a1
Merge pull request #66 from wmcadigital/revert-65-ds1.1
rolorogan Dec 17, 2020
7775a69
Revert "Revert "feat: Ds1.1 - Design System Updates"" (#74)
rolorogan Jan 7, 2021
bb2e3be
Merge branch 'master' into release
rolorogan Jan 7, 2021
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
Binary file added .DS_Store
Binary file not shown.
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# 1. WMCA Design System

[![Last commit](https://img.shields.io/github/last-commit/wmcadigital/wmcads-design-system?style=flat-square)](https://github.com/wmcadigital/wmca-design-system/commits/master)
[![Open Github issues](https://img.shields.io/github/issues-raw/wmcadigital/wmcads-design-system?style=flat-square)](https://github.com/wmcadigital/wmca-design-system/issues)
![Netlify](https://img.shields.io/netlify/04471bb6-9621-4c59-abe8-b4fdf74a3860)
![David](https://img.shields.io/david/wmcadigital/wmca-design-system?style=flat-square)
![GitHub last commit](https://img.shields.io/github/last-commit/wmcadigital/wmca-design-system?style=flat-square)
![GitHub issues](https://img.shields.io/github/issues-raw/wmcadigital/wmca-design-system?style=flat-square)

## 1.1. Table of contents

Expand Down
Binary file modified doc/preview.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 docs/components/accordion/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/breadcrumb/index.html

Large diffs are not rendered by default.

66 changes: 1 addition & 65 deletions docs/components/buttons/index.html

Large diffs are not rendered by default.

59 changes: 49 additions & 10 deletions docs/components/content-card/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/content-tiles/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/details/index.html

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/components/disruption-indicators/index.html

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions docs/components/document/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/file-download/index.html

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/components/form-elements/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/in-text-step/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/inset-text/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/links/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/lists/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/loader/index.html

Large diffs are not rendered by default.

16 changes: 1 addition & 15 deletions docs/components/message/index.html

Large diffs are not rendered by default.

27 changes: 27 additions & 0 deletions docs/components/page-header/index.html

Large diffs are not rendered by default.

17 changes: 2 additions & 15 deletions docs/components/phase-indicator/index.html

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions docs/components/portfolio-dashboard/index.html

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions docs/components/portfolio-leads/index.html

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions docs/components/share/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/table/index.html

Large diffs are not rendered by default.

15 changes: 15 additions & 0 deletions docs/components/tag/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/components/warning-text/index.html

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion docs/css/react-native/wmcads-components.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion docs/css/react-native/wmcads.min.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docs/css/wmcads-components.min.css

This file was deleted.

2 changes: 1 addition & 1 deletion docs/css/wmcads-website.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/css/wmcads.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/img/wmcads-icons.min.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion docs/img/wmcads-sprite.min.svg

This file was deleted.

2 changes: 1 addition & 1 deletion docs/index.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/js/wmcads-website.min.js.map

Large diffs are not rendered by default.

74 changes: 39 additions & 35 deletions docs/json/merged.njk.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"name": "Content card"
},
{
"name": "Content Tiles"
"name": "Document"
},
{
"name": "Details"
Expand Down Expand Up @@ -74,12 +74,27 @@
{
"name": "Message"
},
{
"name": "Page header"
},
{
"name": "Phase indicator"
},
{
"name": "Portfolio dashboard"
},
{
"name": "Portfolio leads"
},
{
"name": "Share"
},
{
"name": "Table"
},
{
"name": "Tag"
},
{
"name": "Warning text"
}
Expand Down Expand Up @@ -109,6 +124,9 @@
{
"name": "Header and footer"
},
{
"name": "Header v2"
},
{
"name": "Question Form"
},
Expand All @@ -124,41 +142,39 @@
"colors": {
"brand": [
{
"varName": "primary",
"name": "Primary Orange"
"varName": "brandFurnaceOrange",
"name": "Furnace Orange"
},
{
"varName": "secondary",
"name": "Secondary Grey"
}
],
"modal": [
{
"varName": "bus",
"name": "Bus"
},
{
"varName": "metro",
"name": "Metro"
"varName": "brandCoolGrey",
"name": "Cool Grey"
},
{
"varName": "railway",
"name": "WM Railway"
"varName": "brandWmGreen",
"name": "WM Green"
},
{
"varName": "susTravel",
"name": "Sustainable Travel"
"varName": "brandWmRed",
"name": "WM Red"
},
{
"varName": "roads",
"name": "Roads"
"varName": "brandWmPurple",
"name": "WM Purple"
},
{
"varName": "taxi",
"name": "Taxi"
"varName": "brandWmBlue",
"name": "WM Blue"
}
],
"web": [
{
"varName": "primary",
"name": "Primary Orange"
},
{
"varName": "secondary",
"name": "Secondary Grey"
},
{
"varName": "text",
"name": "Text"
Expand All @@ -178,21 +194,9 @@
{
"varName": "success",
"name": "Success"
},
{
"varName": "information",
"name": "Information"
}
],
"backgroundOnly": [
{
"varName": "plannedDisruption",
"name": "Planned Disruption"
},
{
"varName": "disable",
"name": "Disabled Elements"
},
{
"varName": "background",
"name": "Background"
Expand Down
60 changes: 0 additions & 60 deletions docs/njk/components/accordion/_accordion.njk

This file was deleted.

40 changes: 0 additions & 40 deletions docs/njk/components/breadcrumb/_breadcrumb.njk

This file was deleted.

53 changes: 0 additions & 53 deletions docs/njk/components/button/_button.njk

This file was deleted.

13 changes: 0 additions & 13 deletions docs/njk/components/button/_example.njk

This file was deleted.

25 changes: 0 additions & 25 deletions docs/njk/components/content-card/_content-card.njk

This file was deleted.

52 changes: 0 additions & 52 deletions docs/njk/components/content-tiles/advice-moving/advice-moving.njk

This file was deleted.

Loading