From 97de9ff7b5bfc06983efff14578ed70edaf7b543 Mon Sep 17 00:00:00 2001 From: Igor Guastalla de Lima Date: Tue, 11 Dec 2018 23:03:56 -0200 Subject: [PATCH 1/4] feat(icons): add gmail and linkedin icons --- index.html | 8 ++++++++ package-lock.json | 28 +++++++++++++++++++++------- scss/icons/gmail.scss | 20 ++++++++++++++++++++ scss/icons/icons.scss | 10 ++++++++++ scss/icons/linkedin.scss | 20 ++++++++++++++++++++ 5 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 scss/icons/gmail.scss create mode 100644 scss/icons/linkedin.scss diff --git a/index.html b/index.html index efe01fd1..9d654348 100644 --- a/index.html +++ b/index.html @@ -280,6 +280,14 @@

SNS

+ + + + + + + + diff --git a/package-lock.json b/package-lock.json index e4ab1d10..61549416 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5882,12 +5882,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5902,17 +5904,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6029,7 +6034,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6041,6 +6047,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6055,6 +6062,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6062,12 +6070,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6086,6 +6096,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -6166,7 +6177,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6178,6 +6190,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -6299,6 +6312,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", diff --git a/scss/icons/gmail.scss b/scss/icons/gmail.scss new file mode 100644 index 00000000..0a58cba1 --- /dev/null +++ b/scss/icons/gmail.scss @@ -0,0 +1,20 @@ +$icon-gmail-colors: (#eeecec, #fd2b2b); +// prettier-ignore +$icon-gmail: ( + (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), + (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), + (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (2,2,2,1,1,1,1,1,1,1,1,1,1,2,2,2), + (2,2,2,2,1,1,1,1,1,1,1,1,2,2,2,2), + (2,2,1,2,2,1,1,1,1,1,1,2,2,1,2,2), + (2,2,1,1,2,2,1,1,1,1,2,2,1,1,2,2), + (2,2,1,1,1,2,2,1,1,2,2,1,1,1,2,2), + (2,2,1,1,1,1,2,2,2,2,1,1,1,1,2,2), + (2,2,1,1,1,1,1,2,2,1,1,1,1,1,2,2), + (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), + (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) +); diff --git a/scss/icons/icons.scss b/scss/icons/icons.scss index 43971b90..fa6a3717 100644 --- a/scss/icons/icons.scss +++ b/scss/icons/icons.scss @@ -13,6 +13,8 @@ @import "twitch.scss"; @import "reddit.scss"; @import "whatsapp.scss"; +@import "gmail.scss"; +@import "linkedin.scss"; // others @import "close.scss"; @@ -112,6 +114,14 @@ &.whatsapp::before { @include pixelize($icon-whatsapp, $icon-whatsapp-colors, $px); } + + &.gmail::before { + @include pixelize($icon-gmail, $icon-gmail-colors, $px); + } + + &.linkedin::before { + @include pixelize($icon-linkedin, $icon-linkedin-colors, $px); + } } // default diff --git a/scss/icons/linkedin.scss b/scss/icons/linkedin.scss new file mode 100644 index 00000000..e78e09c0 --- /dev/null +++ b/scss/icons/linkedin.scss @@ -0,0 +1,20 @@ +$icon-linkedin-colors: (#fff, #2577b9); +// prettier-ignore +$icon-linkedin: ( + (0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0), + (2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2), + (2,2,1,1,1,2,2,2,2,2,2,2,2,2,2,2), + (2,2,1,1,1,2,2,2,2,2,2,2,2,2,2,2), + (2,2,1,1,1,2,2,2,2,2,2,2,2,2,2,2), + (2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2), + (2,2,1,1,1,2,1,1,1,2,1,1,1,2,2,2), + (2,2,1,1,1,2,1,1,1,1,1,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,1,1,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,1,2,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,2,2,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,2,2,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,2,2,1,1,1,2,2), + (2,2,1,1,1,2,1,1,1,2,2,1,1,1,2,2), + (2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2), + (0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0), +); From e19af554e52159a7f167d84b34e86d31d8095232 Mon Sep 17 00:00:00 2001 From: Igor Guastalla de Lima Date: Tue, 11 Dec 2018 23:05:36 -0200 Subject: [PATCH 2/4] docs(icons): add gmail and linkedin to storybook --- docs/icons.stories.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/icons.stories.js b/docs/icons.stories.js index 971946b8..699682a4 100644 --- a/docs/icons.stories.js +++ b/docs/icons.stories.js @@ -14,6 +14,8 @@ stories.add('icon', () => { 'nes-icon google': 'nes-icon google', 'nes-icon youtube': 'nes-icon youtube', 'nes-icon whatsapp': 'nes-icon whatsapp', + 'nes-icon gmail': 'nes-icon gmail', + 'nes-icon linkedin': 'nes-icon linkedin', 'nes-icon close': 'nes-icon close', 'nes-pokeball': 'nes-pokeball', 'nes-bulbasaur': 'nes-bulbasaur', From 77cd5926e8c1d4f7be6cbb7dd48d2a5e5ff07aa2 Mon Sep 17 00:00:00 2001 From: Igor Guastalla de Lima Date: Wed, 12 Dec 2018 07:47:41 -0200 Subject: [PATCH 3/4] feat(icons): removed corners from gmail icon --- scss/icons/gmail.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scss/icons/gmail.scss b/scss/icons/gmail.scss index 0a58cba1..644b0cd3 100644 --- a/scss/icons/gmail.scss +++ b/scss/icons/gmail.scss @@ -3,7 +3,7 @@ $icon-gmail-colors: (#eeecec, #fd2b2b); $icon-gmail: ( (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), - (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (0,2,1,1,1,1,1,1,1,1,1,1,1,1,2,0), (2,2,2,1,1,1,1,1,1,1,1,1,1,2,2,2), (2,2,2,2,1,1,1,1,1,1,1,1,2,2,2,2), (2,2,1,2,2,1,1,1,1,1,1,2,2,1,2,2), @@ -14,7 +14,7 @@ $icon-gmail: ( (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), - (2,2,1,1,1,1,1,1,1,1,1,1,1,1,2,2), + (0,2,1,1,1,1,1,1,1,1,1,1,1,1,2,0), (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0), (0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) ); From fe5df677b78b8c31010873a5fe427e0789ef2049 Mon Sep 17 00:00:00 2001 From: Igor Guastalla de Lima Date: Wed, 12 Dec 2018 10:02:49 -0200 Subject: [PATCH 4/4] fix(lock): package-lock rollback --- package-lock.json | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/package-lock.json b/package-lock.json index 61549416..e4ab1d10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5882,14 +5882,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5904,20 +5902,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -6034,8 +6029,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -6047,7 +6041,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6062,7 +6055,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6070,14 +6062,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -6096,7 +6086,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6177,8 +6166,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -6190,7 +6178,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -6312,7 +6299,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",