diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 231932b..5ffbb53 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,12 +1,14 @@ ## The Contribution Process ### Here is what you need to do to make a contribution: -1. [Clone](https://help.github.com/articles/cloning-a-repository/) this repo + +1. [Clone](https://help.github.com/articles/cloning-a-repository/) this repository 2. Make a new [branch](https://help.github.com/articles/creating-and-deleting-branches-within-your-repository/) 3. Edit the Sketch UI Kit file to include your changes 3. Create a [pull request](https://help.github.com/articles/using-pull-requests/) ### And here is what we will do: + 1. Review your pull request 2. Provide you with feedback on your changes and what, if any, additional changes we’d like to see before bringing them into the master file 3. Once we are on the same page about your proposed changes, we will go ahead and manually merge them into the master file diff --git a/README.md b/README.md index 9c49b91..38b723b 100644 --- a/README.md +++ b/README.md @@ -26,24 +26,19 @@ Download the most recent version of [Sketch](https://www.sketchapp.com/). ---- ## Contribute! + The SLDS team welcomes your help in maintaining and growing this UI kit. Here are a few of the kinds of contributions we are looking for: -1. **Bug fixes:** fixing goofs in the Sketch file where what it has for a component doesn’t match what we are displaying for that component in the code-based documentation -2. **New Pattern:** sharing your design for arranging several components into a useful UI widget -3. **New Template:** sharing a more complex design that contains components and patterns arranged into an entire screen layout +1. **Bug fixes:** fixing goofs in the Sketch file where what it has for a component doesn’t match what we are displaying for that component in the code-based documentation +2. **New Pattern:** sharing your design for arranging several components into a useful UI widget +3. **New Template:** sharing a more complex design that contains components and patterns arranged into an entire screen layout ### Got something to add? -Great! Please take a look at our [contribution guidelines](CONTRIBUTING.md) for instructions on how to proceed. - -## License -Copyright (c) 2016, salesforce.com, inc. All rights reserved. +Great! Please take a look at our [contribution guidelines](https://github.com/salesforce-ux/design-system-ui-kit/blob/master/CONTRIBUTING.md) for instructions on how to proceed. -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: -Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. -Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. +## License -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +All icons and images are licensed under [Creative Commons Attribution-NoDerivatives 4.0](https://github.com/salesforce-ux/licenses/blob/master/LICENSE-icons-images.txt) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 46a34f9..122aab8 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -4,6 +4,26 @@ +## [2.0.0] - 2017-03-31 + +An all new Design System UI Kit entirely revisited for Spring ’17, featuring: + +- UI Layouts for easy plug-in design +- Additional components, states, and variants +- Components are broken down to follow the new Spring ’17 taxonomy +- Reduced number of symbols for easier customization + +New and updated components: + +- Docked Utility Bar +- Empty State Illustrations +- Hero Buttons +- Progress Bar +- Progress Indicator +- Rich Text Editor +- Vertical Navigation +- And more! + ## [1.0.2] - 2016-09-28 - Added the word “experience” @@ -17,6 +37,7 @@ - Initial release -[Unreleased]: https://github.com/salesforce-ux/design-system-ui-kit/compare/v1.0.2...HEAD +[Unreleased]: https://github.com/salesforce-ux/design-system-ui-kit/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/salesforce-ux/design-system-ui-kit/compare/v1.0.2...v2.0.0 [1.0.2]: https://github.com/salesforce-ux/design-system-ui-kit/compare/v1.0.1...v1.0.2 [1.0.1]: https://github.com/salesforce-ux/design-system-ui-kit/compare/v1.0.0...v1.0.1 diff --git a/package.json b/package.json index cbd909d..e482e11 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce-ux/design-system-ui-kit", - "version": "1.0.1", + "version": "2.0.0", "description": "Lightning Design System UI Kit", "main": "sketch-ui-kit.sketch", "scripts": { @@ -14,7 +14,7 @@ "salesforce" ], "author": "Salesforce", - "license": "SEE LICENSE IN README", + "license": "SEE LICENSE IN README.md", "bugs": { "url": "https://github.com/salesforce-ux/design-system-ui-kit/issues" }, diff --git a/sketch-ui-kit.sketch b/sketch-ui-kit.sketch index 9f451d3..fd9304e 100644 Binary files a/sketch-ui-kit.sketch and b/sketch-ui-kit.sketch differ