Skip to content

Commit

Permalink
Merge branch 'develop' into feature/menu
Browse files Browse the repository at this point in the history
  • Loading branch information
italomarcel committed Dec 17, 2018
2 parents 2f1b137 + 050776b commit f011eb5
Show file tree
Hide file tree
Showing 36 changed files with 161 additions and 159 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.7"></a>
## 1.11.7 (2018-12-17)

* feat: add customization for card
* feat: Change primary color from #95C93D to #0DB14B
* feat: add customization for button
* feat: add input regression test
* feat: add login regression test

<a name="1.11.6"></a>
## 1.11.6 (2018-11-14)

Expand Down
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.6",
"version": "1.11.7",
"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.6",
"version": "1.11.7",
"description": "Sling Assets",
"author": "Stone Pagamentos",
"module": "src/index.js",
Expand Down
52 changes: 17 additions & 35 deletions packages/sling-assets/src/icons/index.js
Original file line number Diff line number Diff line change
@@ -1,35 +1,17 @@
import { CANCEL } from './js/baseline-cancel-24px.js';
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,
};
export { CANCEL } from './js/baseline-cancel-24px.js';
export { CHECK_CIRCLE } from './js/baseline-check_circle-24px.js';
export { CLOSE } from './js/baseline-close-24px.js';
export { ERROR } from './js/baseline-error-24px.js';
export { FEEDBACK } from './js/baseline-feedback-24px.js';
export { VISA } from './js/cardbrand-visa.js';
export { MASTERCARD } from './js/cardbrand-mastercard.js';
export { AMERICAN_EXPRESS } from './js/cardbrand-american-express.js';
export { TICKET } from './js/cardbrand-ticket.js';
export { SODEXO } from './js/cardbrand-sodexo.js';
export { VR } from './js/cardbrand-vr.js';
export { ALELO } from './js/cardbrand-alelo.js';
export { HIPERCARD } from './js/cardbrand-hipercard.js';
export { SENFF } from './js/cardbrand-senff.js';
export { ELO } from './js/cardbrand-elo.js';
export { STONE } from './js/cardbrand-stone.js';
export { ELLIPSIS } from './js/ellipsis.js';
6 changes: 6 additions & 0 deletions packages/sling-assets/src/icons/js/ellipsis.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const ELLIPSIS =
`<svg xmlns="http://www.w3.org/2000/svg" width="32" height="8" viewBox="0 0 32 8">
<circle cx="4" cy="4" r="4"></circle>
<circle cx="16" cy="4" r="4"></circle>
<circle cx="28" cy="4" r="4"></circle>
</svg>`;
5 changes: 5 additions & 0 deletions packages/sling-assets/src/icons/svg/ellipsis.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions packages/sling-framework/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "sling-framework",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Framework",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"sling-helpers": "^1.11.6"
"sling-helpers": "^1.11.7"
}
}
2 changes: 1 addition & 1 deletion packages/sling-helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sling-helpers",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Helpers",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
Expand Down
8 changes: 4 additions & 4 deletions packages/sling-web-component-brand-icon/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "sling-web-component-brand-icon",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Brand Icon",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"sling-assets": "^1.11.6",
"sling-framework": "^1.11.6",
"sling-helpers": "^1.11.6"
"sling-assets": "^1.11.7",
"sling-framework": "^1.11.7",
"sling-helpers": "^1.11.7"
}
}
6 changes: 3 additions & 3 deletions packages/sling-web-component-button/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "sling-web-component-button",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Button",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"sling-framework": "^1.11.6",
"sling-helpers": "^1.11.6"
"sling-framework": "^1.11.7",
"sling-helpers": "^1.11.7"
}
}
80 changes: 36 additions & 44 deletions packages/sling-web-component-button/src/assets/Button.css
Original file line number Diff line number Diff line change
Expand Up @@ -48,26 +48,29 @@
/* default */

.emd-btn {
border-color: #2d3844;
background-color: #2d3844;
color: #fff;
fill: #fff;
border-color: var(--sling-button-border-color,#2d3844);
background-color: var(--sling-button-background-color,#2d3844);
color: var(--sling-button-text-color,#fff);
fill: var(--sling-button-text-color,#fff);
}

.emd-btn:hover,
.emd-btn:focus,
.emd-btn:active {
border-color: #0c1219;
filter: brightness(80%);
}

.emd-btn:active {
background-color: #0c1219;
.emd-btn:hover,
.emd-btn:focus {
box-shadow: 0 4px 18px 0 rgba(0, 0, 0, 0.2);
}

.emd-btn.emd-btn_layout_outline,
.emd-btn.emd-btn_layout_text {
color: #2d3844;
fill: #2d3844;
.emd-btn.emd-btn_layout_outline {
color: var(--sling-button-text-color,var(--sling-button-border-color));
fill: var(--sling-button-text-color,var(--sling-button-border-color));
}

.emd-btn.emd-btn_layout_text{
color: var(--sling-button-text-color,#2d3844);
fill: var(--sling-button-text-color,#2d3844);
}

.emd-btn.emd-btn_layout_outline:hover,
Expand All @@ -76,8 +79,8 @@
.emd-btn.emd-btn_layout_text:hover,
.emd-btn.emd-btn_layout_text:focus,
.emd-btn.emd-btn_layout_text:active {
color: #0c1219;
fill: #0c1219;
box-shadow:none;
filter: brightness(70%);
}

.emd-btn.emd-btn_layout_outline:active {
Expand All @@ -87,26 +90,21 @@
/* primary */

.emd-btn_color_primary {
border-color: var(--sling-button-primary-color, #95c93d);
background-color: var(--sling-button-primary-color, #95c93d);
border-color: var(--sling-button-primary-color, #0DB14B);
background-color: var(--sling-button-primary-color, #0DB14B);
color: #fff;
fill: #fff;
}

.emd-btn_color_primary:hover,
.emd-btn_color_primary:focus,
.emd-btn_color_primary:active {
border-color: var(--sling-button-primary-highlight-color, #7aa436);
}

.emd-btn_color_primary:active {
background-color: var(--sling-button-primary-highlight-color, #7aa436);
background-color: var(--sling-button-primary-highlight-color, #0C9141);
}

.emd-btn_color_primary.emd-btn_layout_outline,
.emd-btn_color_primary.emd-btn_layout_text {
color: var(--sling-button-primary-color, #95c93d);
fill: var(--sling-button-primary-color, #95c93d);
color: var(--sling-button-primary-color, #0DB14B);
fill: var(--sling-button-primary-color, #0DB14B);
}

.emd-btn_color_primary.emd-btn_layout_outline:hover,
Expand All @@ -115,12 +113,12 @@
.emd-btn_color_primary.emd-btn_layout_text:hover,
.emd-btn_color_primary.emd-btn_layout_text:focus,
.emd-btn_color_primary.emd-btn_layout_text:active {
color: var(--sling-button-primary-highlight-color, #7aa436);
fill: var(--sling-button-primary-highlight-color, #7aa436);
color: var(--sling-button-primary-highlight-color, #0C9141);
fill: var(--sling-button-primary-highlight-color, #0C9141);
}

.emd-btn_color_primary.emd-btn_layout_outline:active {
background-color: var(--sling-button-primary-active-color, rgba(149, 201, 61, 0.2));
background-color: var(--sling-button-primary-active-color, rgba(12, 145, 65, 0.2));
}

/* success */
Expand All @@ -132,11 +130,7 @@
fill: #fff;
}

.emd-btn_color_success:hover,
.emd-btn_color_success:focus,
.emd-btn_color_success:active {
border-color: #27a75f;
}


.emd-btn_color_success:active {
background-color: #27a75f;
Expand Down Expand Up @@ -171,11 +165,7 @@
fill: #fff;
}

.emd-btn_color_danger:hover,
.emd-btn_color_danger:focus,
.emd-btn_color_danger:active {
border-color: #bb4035;
}


.emd-btn_color_danger:active {
background-color: #bb4035;
Expand Down Expand Up @@ -210,11 +200,6 @@
fill: #ebebf0;
}

.emd-btn_color_light:hover,
.emd-btn_color_light:focus,
.emd-btn_color_light:active {
border-color: #fff;
}

.emd-btn_color_light:active {
background-color: #fff;
Expand Down Expand Up @@ -269,10 +254,17 @@
background-color: transparent;
}

.emd-btn_disabled:hover,
.emd-btn_disabled:focus,
.emd-btn_disabled:active,
.emd-btn_disabled.emd-btn_layout_outline:hover,
.emd-btn_disabled.emd-btn_layout_outline:focus,
.emd-btn_disabled.emd-btn_layout_outline:active,
.emd-btn_disabled.emd-btn_layout_text:hover,
.emd-btn_disabled.emd-btn_layout_text:focus,
.emd-btn_disabled.emd-btn_layout_text:active {
border-color: transparent;
box-shadow: none;
filter: none;
}

/* outline and text */
Expand Down
8 changes: 4 additions & 4 deletions packages/sling-web-component-calendar/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "sling-web-component-calendar",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Calendar",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"moment": "^2.22.2",
"sling-framework": "^1.11.6",
"sling-helpers": "^1.11.6",
"sling-web-component-paginator": "^1.11.6"
"sling-framework": "^1.11.7",
"sling-helpers": "^1.11.7",
"sling-web-component-paginator": "^1.11.7"
}
}
6 changes: 3 additions & 3 deletions packages/sling-web-component-card/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "sling-web-component-card",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Card",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"sling-framework": "^1.11.6",
"sling-helpers": "^1.11.6"
"sling-framework": "^1.11.7",
"sling-helpers": "^1.11.7"
}
}
4 changes: 2 additions & 2 deletions packages/sling-web-component-card/src/assets/Card.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;

border: 1px solid #C3C8D2;
border-radius: 2px;
border-radius: var(--sling-card-border-radius, 10px);
box-shadow: var(--sling-card-box-shadow, 0 4px 18px 0 rgba(0, 0, 0, 0.1));
color: #424B54;
font-family: 'Heebo', sans-serif;
width: 100%;
Expand Down
10 changes: 5 additions & 5 deletions packages/sling-web-component-form/package.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"name": "sling-web-component-form",
"version": "1.11.6",
"version": "1.11.7",
"description": "Sling Form",
"module": "src/index.js",
"main": "dist/cjs/es5/index.js",
"jsnext:main": "dist/es/es6/index.js",
"author": "Stone Pagamentos",
"dependencies": {
"sling-framework": "^1.11.6",
"sling-helpers": "^1.11.6",
"sling-web-component-button": "^1.11.6",
"sling-web-component-input": "^1.11.6"
"sling-framework": "^1.11.7",
"sling-helpers": "^1.11.7",
"sling-web-component-button": "^1.11.7",
"sling-web-component-input": "^1.11.7"
}
}
Loading

0 comments on commit f011eb5

Please sign in to comment.