Skip to content

Commit

Permalink
Merge branch 'develop' into feature/CMPDC-1043
Browse files Browse the repository at this point in the history
  • Loading branch information
italomarcel committed Nov 14, 2018
2 parents 9da8d78 + f1351cb commit 875e64c
Show file tree
Hide file tree
Showing 56 changed files with 713 additions and 345 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<a name="1.11.6"></a>
## 1.11.6 (2018-11-14)

* fix: Expose svg logos on sling-assets.
* fix: Expose withEventDispatch on Sling Framework.
* fix: add regression tests for Label and Snackbar.
* fix: fix Button so that it does not dispatch the click event when disabled.


<a name="1.11.5"></a>
## 1.11.5 (2018-11-08)

Expand Down
8 changes: 4 additions & 4 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,7 +1,7 @@
{
"name": "sling-framework",
"description": "Sling Web Framework main repo.",
"version": "1.11.5",
"version": "1.11.6",
"private": true,
"flat": true,
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/sling-assets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sling-assets",
"version": "1.11.5",
"version": "1.11.6",
"description": "Sling Assets",
"author": "Stone Pagamentos",
"module": "src/index.js",
Expand Down
22 changes: 22 additions & 0 deletions packages/sling-assets/src/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,33 @@ import { CHECK_CIRCLE } from './js/baseline-check_circle-24px.js';
import { CLOSE } from './js/baseline-close-24px.js';
import { ERROR } from './js/baseline-error-24px.js';
import { FEEDBACK } from './js/baseline-feedback-24px.js';
import { VISA } from './js/cardbrand-visa.js';
import { MASTERCARD } from './js/cardbrand-mastercard.js';
import { AMERICAN_EXPRESS } from './js/cardbrand-american-express.js';
import { TICKET } from './js/cardbrand-ticket.js';
import { SODEXO } from './js/cardbrand-sodexo.js';
import { VR } from './js/cardbrand-vr.js';
import { ALELO } from './js/cardbrand-alelo.js';
import { HIPERCARD } from './js/cardbrand-hipercard.js';
import { SENFF } from './js/cardbrand-senff';
import { ELO } from './js/cardbrand-elo';
import { STONE } from './js/cardbrand-stone';

export {
CANCEL,
CHECK_CIRCLE,
CLOSE,
ERROR,
FEEDBACK,
VISA,
MASTERCARD,
AMERICAN_EXPRESS,
TICKET,
SODEXO,
VR,
ALELO,
HIPERCARD,
SENFF,
ELO,
STONE,
};
32 changes: 32 additions & 0 deletions packages/sling-assets/src/icons/js/cardbrand-alelo.js

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

Loading

0 comments on commit 875e64c

Please sign in to comment.