Skip to content

Commit

Permalink
Merge pull request #1302 from undp/develop
Browse files Browse the repository at this point in the history
Release 1.2.6
  • Loading branch information
Jura authored Oct 29, 2023
2 parents 2663d1c + 57ff081 commit dc3c9c6
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 21 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
The MIT License

Copyright (C) 2021-2022 United Nations Development Programme
Copyright (C) 2021-2023 United Nations Development Programme

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,16 @@ By unifying design elements into reusable components, development will simplify

The Guide is a living document created to meet the needs of UNDP's front-end developers and designers. If there is a Component or Pattern that you need, or you have any other feedback, question or comment please contact us.


## Demo

Living Style Guide & Documentation: **[Demo](https://design.undp.org)**

## Install from NPM
```bash
npm install @undp/design-system
```
See Starter project at the link below for details of implementaiton
## Starter project

Static generator using Design System as dependency: [UNDP Design System starter template](https://github.com/undp/design-system-starter-template)
Expand Down
2 changes: 1 addition & 1 deletion docs/css/base-minimal-no-grid.min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/css/base-minimal.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/css/components/checkbox-radio-common.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/components/checkbox.min.css

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

6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@undp/design-system",
"version": "1.2.5",
"version": "1.2.6",
"description": "UNDP Design System",
"homepage": "https://design.undp.org",
"main": "index.js",
Expand Down
1 change: 1 addition & 0 deletions stories/Components/Forms/Checkbox/Checkbox.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import './checkbox-radio-common.scss';
import './checkbox.scss';
import '../../../assets/scss/_typography.scss';

Expand Down
13 changes: 13 additions & 0 deletions stories/Components/Forms/Checkbox/checkbox-radio-common.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
@import '../../../assets/scss/variables';

.form-check {
align-items: center;
display: flex;
position: relative;

label {
cursor: pointer;
font-size: $font-size-16;
padding: 0 7px;
}
}
12 changes: 0 additions & 12 deletions stories/Components/Forms/Checkbox/checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,6 @@
@import '../../../assets/scss/breakpoints';

/* checkbox */
.form-check {
align-items: center;
display: flex;
position: relative;

label {
cursor: pointer;
font-size: $font-size-16;
padding: 0 7px;
}
}

input[type='checkbox'] {
@extend %checbox-radio-before;

Expand Down
1 change: 1 addition & 0 deletions stories/Components/Forms/Radio/Radio.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';
import '../Checkbox/checkbox-radio-common.scss';
import './radio.scss';
import '../../../assets/scss/_typography.scss';

Expand Down
1 change: 1 addition & 0 deletions stories/assets/scss/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,4 @@
@import '../../Atom/Table/table';
// @import '../../Atom/Typography/Links/link';
@import '../../Atom/Video/video';
@import '../../Components/Forms/Checkbox/checkbox-radio-common';

0 comments on commit dc3c9c6

Please sign in to comment.