Skip to content

Commit

Permalink
Merge pull request #2436 from salesforce-ux/release-v2.3.0
Browse files Browse the repository at this point in the history
Get 2.3.0 ready for prime time
  • Loading branch information
brandonferrua authored May 15, 2017
2 parents 40df6d4 + 84743b1 commit d29bd96
Show file tree
Hide file tree
Showing 4 changed files with 510 additions and 511 deletions.
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Salesforce Lightning Design System [![Build Status](https://travis-ci.org/salesforce-ux/design-system.svg?branch=master)](https://travis-ci.org/salesforce-ux/design-system) [![Greenkeeper badge](https://badges.greenkeeper.io/salesforce-ux/design-system-internal.svg?token=daad1067bbfc5d75c4fb2372360b4b0869bed68d4dc370f6b618b1db22b8f052)](https://greenkeeper.io/)
# Salesforce Lightning Design System [![Build Status](https://travis-ci.org/salesforce-ux/design-system.svg?branch=master)](https://travis-ci.org/salesforce-ux/design-system) [![Greenkeeper badge](https://badges.greenkeeper.io/salesforce-ux/design-system.svg?token=daad1067bbfc5d75c4fb2372360b4b0869bed68d4dc370f6b618b1db22b8f052)](https://greenkeeper.io/)

Welcome to the [Salesforce Lightning Design System](https://www.lightningdesignsystem.com) brought to you by [Salesforce UX](https://twitter.com/salesforceux).

Expand Down Expand Up @@ -37,19 +37,21 @@ The most intriguing part is the `@selector/@restrict` pair. Each CSS selector sh

For example:

```
```SCSS
/**
* @selector .slds-button
* @restrict button, a, span
*/
.slds-button {
...
}

/**
* @selector .slds-button_brand
* @restrict .slds-button
*/
.slds-button_brand {
...
}
```

Expand All @@ -72,7 +74,7 @@ The markup for a `@variant` will be required from the `/ui/:component/:variant/e

For example:

```
```SCSS
/**
* @name advanced
* @selector .slds-table_fixed-layout
Expand Down
Loading

0 comments on commit d29bd96

Please sign in to comment.