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.

Sign up for GitHub

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

Nr/feat/readme badges #63

Merged
merged 6 commits into from
Dec 17, 2020
Merged

Nr/feat/readme badges #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0c9b782
Merge pull request #58 from wmcadigital/ds1.1
rolorogan Dec 16, 2020
6a07748
update: build path
rolorogan Dec 16, 2020
0fdc394
Merge pull request #59 from wmcadigital/nr/bbugfix/version-release
rolorogan Dec 16, 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
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
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
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
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 13 additions & 13 deletions gulp-tasks/paths.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {
output: 'docs/', // Default output location for code docs
output: 'build/', // Default output location for code build
server: {
port: 8080,
baseDir: './docs/',
root: './docs/'
baseDir: './build/',
root: './build/'
},
styles: {
src: ['src/**/*.scss'], // src of styles to watch
minifySrc: ['src/wmcads/assets/sass/wmcads.scss', 'src/www/wmcads-website.scss'], // List of scss file(s) which should be processed, linted & minified
output: 'docs/css/', // output location of minified styles
output: 'build/css/', // output location of minified styles
reactNativeSrc: 'src/wmcads/assets/sass/wmcads.scss'
},
scripts: {
Expand All @@ -21,39 +21,39 @@ module.exports = {
lint: true
}
],
output: 'docs/js/' // Output location of minified JS files
output: 'build/js/' // Output location of minified JS files
},
fonts: {
src: 'src/wmcads/assets/fonts/**/*',
output: 'docs/fonts/'
output: 'build/fonts/'
},
nunjucks: {
src: 'src/**/*.{njk,md,html}', // Used for watching njk files
websiteSrc: 'src/www/pages/**/*.{njk,md,html}',
componentSrc: 'src/wmcads/**/*.{njk,md,html}',
output: 'docs/',
componentOutput: 'docs/njk'
output: 'build/',
componentOutput: 'build/njk'
},
njkData: {
src: 'src/**/*.njk.json',
output: 'docs/json/'
output: 'build/json/'
},
svgs: {
src: 'src/wmcads/assets/icon/**/*.svg',
dest: 'docs/img/'
dest: 'build/img/'
},
images: {
src: ['src/wmcads/assets/img/**/*.{png,gif,jpg}'],
output: 'src/wmcads/assets/img/**/*',
dest: 'docs/img/'
dest: 'build/img/'
},
config: {
src: 'src/www/assets/config/**/*',
output: 'docs/config/'
output: 'build/config/'
},
netlifyConfig: {
src: '_redirects',
output: 'docs/'
output: 'build/'
},
logs: {
sourcemaps: '_sourcemaps/'
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "wmcads-design-system",
"version": "0.5.19",
"version": "1.0.0",
"description": "A library of typography, visual styles and user interface components which are documented for West Midlands Combined Authority.",
"homepage": "https://wmcadigital.github.io/wmca-design-system",
"author": "WMCA",
"main": "src/www/pages/index.njk",
"private": true,
"files": [
"docs/*"
"build/*"
],
"repository": "https://github.com/wmcadigital/wmca-design-system.git",
"copyright": "WMCA",
Expand Down
4 changes: 2 additions & 2 deletions src/www/pages/index.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<html lang="en-gb" class="wmcads-html">
<head>
<!-- CSS for WMCA Design System -->
<link rel="stylesheet" href="tbc" />
<link rel="stylesheet" href="https://cloudcdn.wmca.org.uk/wmcaassets/$*version/css/wmcads.min.css" />
</head>
<body>
<!-- site content... -->
Expand All @@ -167,7 +167,7 @@
<pre>
<code class="javascript" tabindex="0">
{% filter forceescape %}// Import react native styles for WMCA Design System
import wmcadsStyles from "tbc"
import wmcadsStyles from "https://cloudcdn.wmca.org.uk/wmcaassets/$*version/css/react-native/wmnds.min.js"
{%- endfilter %}
</code>
</pre>
Expand Down