Skip to content

Commit

Permalink
Merge pull request #1537 from salesforce-ux/chore/update-release-note…
Browse files Browse the repository at this point in the history
…s-2.1.3

Get ready for 2.1.3
  • Loading branch information
Kaelig Deloumeau-Prigent authored Sep 21, 2016
2 parents 7941cc3 + e341b16 commit c23fb3e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
5 changes: 4 additions & 1 deletion RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@

<!-- Release notes authoring guidelines: http://keepachangelog.com/ -->

## [Unreleased]
<!-- ## [Unreleased] -->

## Release [2.1.3] - September 21, 2016

**FIXED**

Expand Down Expand Up @@ -747,6 +749,7 @@ The following features are being marked as deprecated in this release and will b
Lots of bug fixes and TLC.

[Unreleased]: https://github.com/salesforce-ux/design-system-internal/compare/v2.1.2...winter-17
[2.1.3]: https://github.com/salesforce-ux/design-system/compare/v2.1.2...v2.1.3
[2.1.2]: https://github.com/salesforce-ux/design-system/compare/v2.0.3...v2.1.2
[2.0.3]: https://github.com/salesforce-ux/design-system/compare/v2.0.2...v2.0.3
[2.0.2]: https://github.com/salesforce-ux/design-system/compare/v2.0.1...v2.0.2
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "design-system",
"description": "Salesforce Lightning Design System",
"version": "2.1.2-dev",
"version": "2.1.3-dev",
"author": "Salesforce",
"slds": {
"name": "Winter ’17",
Expand All @@ -18,7 +18,7 @@
},
"devDependencies": {
"@salesforce-ux/build-server-api": "^1.3.6",
"@salesforce-ux/design-tokens": "3.7.0",
"@salesforce-ux/design-tokens": "3.8.0",
"@salesforce-ux/icons": "5.2.0",
"@salesforce-ux/design-system-ui-kit": "github:salesforce-ux/design-system-ui-kit#v1.0.1",
"app-module-path": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion ui/_config.scss
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
///
/// @type String
/// @access private
$app-version: '2.1.2';
$app-version: '2.1.3';

/// Debug mode (uncomment to activate)
/// Turn on to output deprecation warnings during development
Expand Down
5 changes: 0 additions & 5 deletions ui/_design-tokens.scss
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
'@salesforce-ux/design-tokens/dist/bg-custom.map.scss',
'@salesforce-ux/design-tokens/dist/bg-standard.map.scss';


// TODO: Add to Design Tokens
$square-icon-xx-small-content: 0.875rem default;


// MQ
$mq-x-small: 320px !default;
$mq-small: 480px !default;
Expand Down

0 comments on commit c23fb3e

Please sign in to comment.