Skip to content

Commit

Permalink
Merge pull request #164 from citizensadvice/release/v1-0-0
Browse files Browse the repository at this point in the history
Release: v1.0.0
  • Loading branch information
chic-geek authored Mar 7, 2019
2 parents f9fa5c9 + e51eb11 commit 0630402
Show file tree
Hide file tree
Showing 57 changed files with 179 additions and 197 deletions.
46 changes: 3 additions & 43 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,47 +23,10 @@ We also make use of Docker to make sure we avoid the "it works on my machine" st

## Framework guide

### Getting started

Firstly we need to introduce **ALL** packages available for installation:

| Name | Type | Description |
| --------------------------------------------- | --------- | ------------------------------------------------------- |
| `@citizensadvice/cads-support` | support | System-wide global variables and functions |
| `@citizensadvice/cads-typography` | generic | Generic typographic styling |
| `@citizensadvice/cads-links` | generic | Generic links styles |
| `@citizensadvice/cads-tables` | generic | Generic table styling |
| `@citizensadvice/cads-wrapper` | object | Component for container elements at a set width |
| `@citizensadvice/cads-grid` | object | Custom grid system |
| `@citizensadvice/cads-list` | object | Component for creating lists |
| `@citizensadvice/cads-global-header` | component | System-wide global header |
| `@citizensadvice/cads-global-footer` | component | System-wide global footer |
| `@citizensadvice/cads-buttons` | component | Custom button components |
| `@citizensadvice/cads-button-container` | component | Component for holding buttons |
| `@citizensadvice/cads-blockquote` | component | Custom styles for blockquotes |
| `@citizensadvice/cads-section-nav` | component | Side navigation component styling |
| `@citizensadvice/cads-form-elements` | component | Support tool for `form-` components |
| `@citizensadvice/cads-form-fieldsets` | component | Custom styling for form elements |
| `@citizensadvice/cads-form-inputs` | component | Custom styling for form elements |
| `@citizensadvice/cads-form-labels` | component | Custom styling for form elements |
| `@citizensadvice/cads-form-textareas` | component | Custom styling for form elements |
| `@citizensadvice/cads-form-selects` | component | Custom styling for form elements |
| `@citizensadvice/cads-form-radios-checkboxes` | component | Custom styling for form elements |
| `@citizensadvice/cads-well` | component | Component for separating chunks of content |
| `@citizensadvice/cads-icons` | utility | Icon system |
| `@citizensadvice/cads-line-limit` | utility | Helper classes for limiting line length |
| `@citizensadvice/cads-positioning` | utility | Helper classes for positioning elements |
| `@citizensadvice/cads-spacing` | utility | Helper classes for spacing elements correctly |
| `@citizensadvice/cads-charwidth` | utility | Helper classes for setting character limits on elements |

> More detail of each package can be seen in each packages own `README.md`.
### Installation

Once you've decided on the package(s) you need, run:

```shell
$ npm install @citizensadvice/cads-[package-name]
$ npm install @citizensadvice/cads
```

### Folder structure
Expand Down Expand Up @@ -95,17 +58,14 @@ For completeness, we've included an output `.css` file for each component. This
#### `lib/`

This directory contains the source files that can be compiled using `sass` during your build process.
We're making use of the ideas of ["ITCSS"](https://www.xfive.co/blog/itcss-scalable-maintainable-css-architecture/), a methodology from [Harry Roberts](https://csswizardry.com/), which can be better undertood by reading the `@citizensadvice/cads-system` `README.md`.

### Usage

Now that you've `npm install` the packages into your `node_modules`, link to them like you would any other `scss` file.

```scss
@import "@citizensadvice/cads-button-container";
@import "@citizensadvice/cads-buttons";
@import "@citizensadvice/cads";
...
```

> Be sure to add `node_modules` to your included-paths for the above to work correctly.

Expand Down Expand Up @@ -282,7 +242,7 @@ Rewrite the repo README to include setup information around the framework.
You'll make many different types of change to the codebase over time but most changes can be categorised under one of the following types. Make use of one of these when writing your commit messages.
| Issue type | Description |
| ---------- | ----------------------------------------------------------------------------- |
|------------|-------------------------------------------------------------------------------|
| `feat` | a new feature |
| `fix` | a bug fix |
| `docs` | changes to documentation |
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"packages": [
"packages/*"
],
"version": "0.0.0",
"version": "1.0.0",
"npmClient": "yarn",
"useWorkspaces": true
}
4 changes: 2 additions & 2 deletions packages/background-colors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/background-colors",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/background-position/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/background-position",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/background-size/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/background-size",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/border-colors/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/border-colors",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/border-radius/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/border-radius",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/border-style/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/border-style",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/border-width/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/border-width",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/borders/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/borders",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/box-sizing/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/box-sizing",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/buttons/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/buttons",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "module"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
10 changes: 5 additions & 5 deletions packages/cads/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/cads",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "meta"
Expand All @@ -14,10 +14,10 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/core": "^0.0.0",
"@citizensadvice/typography": "^0.0.0",
"@citizensadvice/forms": "^0.0.0",
"@citizensadvice/rich-content": "^0.0.0"
"@citizensadvice/core": "^1.0.0",
"@citizensadvice/forms": "^1.0.0",
"@citizensadvice/rich-content": "^1.0.0",
"@citizensadvice/typography": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/clearfix/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/clearfix",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
8 changes: 4 additions & 4 deletions packages/core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/core",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "meta"
Expand All @@ -14,9 +14,9 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0",
"@citizensadvice/normalize": "^0.0.0",
"@citizensadvice/utilities": "^0.0.0"
"@citizensadvice/normalize": "^1.0.0",
"@citizensadvice/support": "^1.0.0",
"@citizensadvice/utilities": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/cursor/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/cursor",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/display/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/display",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/flexbox/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/flexbox",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
4 changes: 2 additions & 2 deletions packages/floats/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@citizensadvice/floats",
"version": "0.0.0",
"version": "1.0.0",
"license": "MIT",
"cads": {
"package_type": "utility"
Expand All @@ -14,7 +14,7 @@
"access": "public"
},
"dependencies": {
"@citizensadvice/support": "^0.0.0"
"@citizensadvice/support": "^1.0.0"
},
"scripts": {
"build": "npm-run-all -p buildcss:expanded buildcss:compressed",
Expand Down
Loading

0 comments on commit 0630402

Please sign in to comment.