diff --git a/src/__tests__/__snapshots__/pages.spec.js.snap b/src/__tests__/__snapshots__/pages.spec.js.snap index de2432d..f13089a 100644 --- a/src/__tests__/__snapshots__/pages.spec.js.snap +++ b/src/__tests__/__snapshots__/pages.spec.js.snap @@ -1029,8 +1029,8 @@ Array [ className="art emoji-header" > 🎨 @@ -1038,9 +1038,14 @@ Array [
- - :art: - +
+ + :art: + +

Improving structure / format of the code.

@@ -1057,8 +1062,8 @@ Array [ className="zap emoji-header" > ⚑️ @@ -1066,9 +1071,14 @@ Array [
- - :zap: - +
+ + :zap: + +

Improving performance.

@@ -1085,8 +1095,8 @@ Array [ className="fire emoji-header" > πŸ”₯ @@ -1094,9 +1104,14 @@ Array [
- - :fire: - +
+ + :fire: + +

Removing code or files.

@@ -1113,8 +1128,8 @@ Array [ className="bug emoji-header" > πŸ› @@ -1122,9 +1137,14 @@ Array [
- - :bug: - +
+ + :bug: + +

Fixing a bug.

@@ -1141,8 +1161,8 @@ Array [ className="ambulance emoji-header" > πŸš‘ @@ -1150,9 +1170,14 @@ Array [
- - :ambulance: - +
+ + :ambulance: + +

Critical hotfix.

@@ -1169,8 +1194,8 @@ Array [ className="sparkles emoji-header" > ✨ @@ -1178,9 +1203,14 @@ Array [
- - :sparkles: - +
+ + :sparkles: + +

Introducing new features.

@@ -1197,8 +1227,8 @@ Array [ className="pencil emoji-header" > πŸ“ @@ -1206,9 +1236,14 @@ Array [
- - :pencil: - +
+ + :pencil: + +

Writing docs.

@@ -1225,8 +1260,8 @@ Array [ className="rocket emoji-header" > πŸš€ @@ -1234,9 +1269,14 @@ Array [
- - :rocket: - +
+ + :rocket: + +

Deploying stuff.

@@ -1253,8 +1293,8 @@ Array [ className="lipstick emoji-header" > πŸ’„ @@ -1262,9 +1302,14 @@ Array [
- - :lipstick: - +
+ + :lipstick: + +

Updating the UI and style files.

@@ -1281,8 +1326,8 @@ Array [ className="tada emoji-header" > πŸŽ‰ @@ -1290,9 +1335,14 @@ Array [
- - :tada: - +
+ + :tada: + +

Initial commit.

@@ -1309,8 +1359,8 @@ Array [ className="white-check-mark emoji-header" > βœ… @@ -1318,9 +1368,14 @@ Array [
- - :white_check_mark: - +
+ + :white_check_mark: + +

Updating tests.

@@ -1337,8 +1392,8 @@ Array [ className="lock emoji-header" > πŸ”’ @@ -1346,9 +1401,14 @@ Array [
- - :lock: - +
+ + :lock: + +

Fixing security issues.

@@ -1365,8 +1425,8 @@ Array [ className="apple emoji-header" > 🍎 @@ -1374,9 +1434,14 @@ Array [
- - :apple: - +
+ + :apple: + +

Fixing something on macOS.

@@ -1393,8 +1458,8 @@ Array [ className="penguin emoji-header" > 🐧 @@ -1402,9 +1467,14 @@ Array [
- - :penguin: - +
+ + :penguin: + +

Fixing something on Linux.

@@ -1421,8 +1491,8 @@ Array [ className="checkered-flag emoji-header" > 🏁 @@ -1430,9 +1500,14 @@ Array [
- - :checkered_flag: - +
+ + :checkered_flag: + +

Fixing something on Windows.

@@ -1449,8 +1524,8 @@ Array [ className="robot emoji-header" > πŸ€– @@ -1458,9 +1533,14 @@ Array [
- - :robot: - +
+ + :robot: + +

Fixing something on Android.

@@ -1477,8 +1557,8 @@ Array [ className="green-apple emoji-header" > 🍏 @@ -1486,9 +1566,14 @@ Array [
- - :green_apple: - +
+ + :green_apple: + +

Fixing something on iOS.

@@ -1505,8 +1590,8 @@ Array [ className="bookmark emoji-header" > πŸ”– @@ -1514,9 +1599,14 @@ Array [
- - :bookmark: - +
+ + :bookmark: + +

Releasing / Version tags.

@@ -1533,8 +1623,8 @@ Array [ className="rotating-light emoji-header" > 🚨 @@ -1542,9 +1632,14 @@ Array [
- - :rotating_light: - +
+ + :rotating_light: + +

Removing linter warnings.

@@ -1561,8 +1656,8 @@ Array [ className="construction emoji-header" > 🚧 @@ -1570,9 +1665,14 @@ Array [
- - :construction: - +
+ + :construction: + +

Work in progress.

@@ -1589,8 +1689,8 @@ Array [ className="green-heart emoji-header" > πŸ’š @@ -1598,9 +1698,14 @@ Array [
- - :green_heart: - +
+ + :green_heart: + +

Fixing CI Build.

@@ -1617,8 +1722,8 @@ Array [ className="arrow-down emoji-header" > ⬇️ @@ -1626,9 +1731,14 @@ Array [
- - :arrow_down: - +
+ + :arrow_down: + +

Downgrading dependencies.

@@ -1645,8 +1755,8 @@ Array [ className="arrow-up emoji-header" > ⬆️ @@ -1654,9 +1764,14 @@ Array [
- - :arrow_up: - +
+ + :arrow_up: + +

Upgrading dependencies.

@@ -1673,8 +1788,8 @@ Array [ className="pushpin emoji-header" > πŸ“Œ @@ -1682,9 +1797,14 @@ Array [
- - :pushpin: - +
+ + :pushpin: + +

Pinning dependencies to specific versions.

@@ -1701,8 +1821,8 @@ Array [ className="construction-worker emoji-header" > πŸ‘· @@ -1710,9 +1830,14 @@ Array [
- - :construction_worker: - +
+ + :construction_worker: + +

Adding CI build system.

@@ -1729,8 +1854,8 @@ Array [ className="chart-with-upwards-trend emoji-header" > πŸ“ˆ @@ -1738,9 +1863,14 @@ Array [
- - :chart_with_upwards_trend: - +
+ + :chart_with_upwards_trend: + +

Adding analytics or tracking code.

@@ -1757,8 +1887,8 @@ Array [ className="recycle emoji-header" > ♻️ @@ -1766,9 +1896,14 @@ Array [
- - :recycle: - +
+ + :recycle: + +

Refactoring code.

@@ -1785,8 +1920,8 @@ Array [ className="whale emoji-header" > 🐳 @@ -1794,9 +1929,14 @@ Array [
- - :whale: - +
+ + :whale: + +

Work about Docker.

@@ -1813,8 +1953,8 @@ Array [ className="heavy-plus-sign emoji-header" > βž• @@ -1822,9 +1962,14 @@ Array [
- - :heavy_plus_sign: - +
+ + :heavy_plus_sign: + +

Adding a dependency.

@@ -1841,8 +1986,8 @@ Array [ className="heavy-minus-sign emoji-header" > βž– @@ -1850,9 +1995,14 @@ Array [
- - :heavy_minus_sign: - +
+ + :heavy_minus_sign: + +

Removing a dependency.

@@ -1869,8 +2019,8 @@ Array [ className="wrench emoji-header" > πŸ”§ @@ -1878,9 +2028,14 @@ Array [
- - :wrench: - +
+ + :wrench: + +

Changing configuration files.

@@ -1897,8 +2052,8 @@ Array [ className="globe-with-meridians emoji-header" > 🌐 @@ -1906,9 +2061,14 @@ Array [
- - :globe_with_meridians: - +
+ + :globe_with_meridians: + +

Internationalization and localization.

@@ -1925,8 +2085,8 @@ Array [ className="pencil emoji-header" > ✏️ @@ -1934,9 +2094,14 @@ Array [
- - :pencil2: - +
+ + :pencil2: + +

Fixing typos.

@@ -1953,8 +2118,8 @@ Array [ className="poop emoji-header" > πŸ’© @@ -1962,9 +2127,14 @@ Array [
- - :poop: - +
+ + :poop: + +

Writing bad code that needs to be improved.

@@ -1981,8 +2151,8 @@ Array [ className="rewind emoji-header" > βͺ @@ -1990,9 +2160,14 @@ Array [
- - :rewind: - +
+ + :rewind: + +

Reverting changes.

@@ -2009,8 +2184,8 @@ Array [ className="twisted-rightwards-arrows emoji-header" > πŸ”€ @@ -2018,9 +2193,14 @@ Array [
- - :twisted_rightwards_arrows: - +
+ + :twisted_rightwards_arrows: + +

Merging branches.

@@ -2037,8 +2217,8 @@ Array [ className="package emoji-header" > πŸ“¦ @@ -2046,9 +2226,14 @@ Array [
- - :package: - +
+ + :package: + +

Updating compiled files or packages.

@@ -2065,8 +2250,8 @@ Array [ className="alien emoji-header" > πŸ‘½ @@ -2074,9 +2259,14 @@ Array [
- - :alien: - +
+ + :alien: + +

Updating code due to external API changes.

@@ -2093,8 +2283,8 @@ Array [ className="truck emoji-header" > 🚚 @@ -2102,9 +2292,14 @@ Array [
- - :truck: - +
+ + :truck: + +

Moving or renaming files.

@@ -2121,8 +2316,8 @@ Array [ className="page-facing-up emoji-header" > πŸ“„ @@ -2130,9 +2325,14 @@ Array [
- - :page_facing_up: - +
+ + :page_facing_up: + +

Adding or updating license.

@@ -2149,8 +2349,8 @@ Array [ className="boom emoji-header" > πŸ’₯ @@ -2158,9 +2358,14 @@ Array [
- - :boom: - +
+ + :boom: + +

Introducing breaking changes.

@@ -2177,8 +2382,8 @@ Array [ className="bento emoji-header" > 🍱 @@ -2186,9 +2391,14 @@ Array [
- - :bento: - +
+ + :bento: + +

Adding or updating assets.

@@ -2205,8 +2415,8 @@ Array [ className="ok-hand emoji-header" > πŸ‘Œ @@ -2214,9 +2424,14 @@ Array [
- - :ok_hand: - +
+ + :ok_hand: + +

Updating code due to code review changes.

@@ -2233,8 +2448,8 @@ Array [ className="wheelchair emoji-header" > ♿️ @@ -2242,9 +2457,14 @@ Array [
- - :wheelchair: - +
+ + :wheelchair: + +

Improving accessibility.

@@ -2261,8 +2481,8 @@ Array [ className="bulb emoji-header" > πŸ’‘ @@ -2270,9 +2490,14 @@ Array [
- - :bulb: - +
+ + :bulb: + +

Documenting source code.

@@ -2289,8 +2514,8 @@ Array [ className="beers emoji-header" > 🍻 @@ -2298,9 +2523,14 @@ Array [
- - :beers: - +
+ + :beers: + +

Writing code drunkenly.

@@ -2317,8 +2547,8 @@ Array [ className="speech-balloon emoji-header" > πŸ’¬ @@ -2326,9 +2556,14 @@ Array [
- - :speech_balloon: - +
+ + :speech_balloon: + +

Updating text and literals.

@@ -2345,8 +2580,8 @@ Array [ className="card-file-box emoji-header" > πŸ—ƒ @@ -2354,9 +2589,14 @@ Array [
- - :card_file_box: - +
+ + :card_file_box: + +

Performing database related changes.

@@ -2373,8 +2613,8 @@ Array [ className="loud-sound emoji-header" > πŸ”Š @@ -2382,9 +2622,14 @@ Array [
- - :loud_sound: - +
+ + :loud_sound: + +

Adding logs.

@@ -2401,8 +2646,8 @@ Array [ className="mute emoji-header" > πŸ”‡ @@ -2410,9 +2655,14 @@ Array [
- - :mute: - +
+ + :mute: + +

Removing logs.

@@ -2429,8 +2679,8 @@ Array [ className="busts-in-silhouette emoji-header" > πŸ‘₯ @@ -2438,9 +2688,14 @@ Array [
- - :busts_in_silhouette: - +
+ + :busts_in_silhouette: + +

Adding contributor(s).

@@ -2457,8 +2712,8 @@ Array [ className="children-crossing emoji-header" > 🚸 @@ -2466,9 +2721,14 @@ Array [
- - :children_crossing: - +
+ + :children_crossing: + +

Improving user experience / usability.

@@ -2485,8 +2745,8 @@ Array [ className="building-construction emoji-header" > πŸ— @@ -2494,9 +2754,14 @@ Array [
- - :building_construction: - +
+ + :building_construction: + +

Making architectural changes.

@@ -2513,8 +2778,8 @@ Array [ className="iphone emoji-header" > πŸ“± @@ -2522,9 +2787,14 @@ Array [
- - :iphone: - +
+ + :iphone: + +

Working on responsive design.

@@ -2541,8 +2811,8 @@ Array [ className="clown-face emoji-header" > 🀑 @@ -2550,9 +2820,14 @@ Array [
- - :clown_face: - +
+ + :clown_face: + +

Mocking things.

@@ -2569,8 +2844,8 @@ Array [ className="egg emoji-header" > πŸ₯š @@ -2578,9 +2853,14 @@ Array [
- - :egg: - +
+ + :egg: + +

Adding an easter egg.

@@ -2597,8 +2877,8 @@ Array [ className="see-no-evil emoji-header" > πŸ™ˆ @@ -2606,9 +2886,14 @@ Array [
- - :see_no_evil: - +
+ + :see_no_evil: + +

Adding or updating a .gitignore file

@@ -2625,8 +2910,8 @@ Array [ className="camera-flash emoji-header" > πŸ“Έ @@ -2634,9 +2919,14 @@ Array [
- - :camera_flash: - +
+ + :camera_flash: + +

Adding or updating snapshots

@@ -2653,8 +2943,8 @@ Array [ className="alembic emoji-header" > βš— @@ -2662,9 +2952,14 @@ Array [
- - :alembic: - +
+ + :alembic: + +

Experimenting new things

@@ -2681,8 +2976,8 @@ Array [ className="mag emoji-header" > πŸ” @@ -2690,9 +2985,14 @@ Array [
- - :mag: - +
+ + :mag: + +

Improving SEO

@@ -2709,8 +3009,8 @@ Array [ className="wheel-of-dharma emoji-header" > ☸️ @@ -2718,9 +3018,14 @@ Array [
- - :wheel_of_dharma: - +
+ + :wheel_of_dharma: + +

Work about Kubernetes

@@ -2737,8 +3042,8 @@ Array [ className="label emoji-header" > 🏷️ @@ -2746,9 +3051,14 @@ Array [
- - :label: - +
+ + :label: + +

Adding or updating types (Flow, TypeScript)

@@ -2765,8 +3075,8 @@ Array [ className="seedling emoji-header" > 🌱 @@ -2774,9 +3084,14 @@ Array [
- - :seedling: - +
+ + :seedling: + +

Adding or updating seed files

@@ -2793,8 +3108,8 @@ Array [ className="triangular-flag-on-post emoji-header" > 🚩 @@ -2802,9 +3117,14 @@ Array [
- - :triangular_flag_on_post: - +
+ + :triangular_flag_on_post: + +

Adding, updating, or removing feature flags

@@ -2821,8 +3141,8 @@ Array [ className="goal-net emoji-header" > πŸ₯… @@ -2830,9 +3150,14 @@ Array [
- - :goal_net: - +
+ + :goal_net: + +

Catching errors

@@ -2849,8 +3174,8 @@ Array [ className="animation emoji-header" > πŸ’« @@ -2858,9 +3183,14 @@ Array [
- - :dizzy: - +
+ + :dizzy: + +

Adding or updating animations and transitions

@@ -2877,8 +3207,8 @@ Array [ className="wastebasket emoji-header" > πŸ—‘ @@ -2886,9 +3216,14 @@ Array [
- - :wastebasket: - +
+ + :wastebasket: + +

Deprecating code that needs to be cleaned up.

diff --git a/src/components/GitmojiList/Gitmoji/index.js b/src/components/GitmojiList/Gitmoji/index.js index fa7d5b5..96a9322 100644 --- a/src/components/GitmojiList/Gitmoji/index.js +++ b/src/components/GitmojiList/Gitmoji/index.js @@ -11,12 +11,17 @@ const Gitmoji = (props: Props) => (
- + {props.emoji}
- {props.code} +
+ {props.code} +

{props.description}

diff --git a/src/components/GitmojiList/__tests__/__snapshots__/gitmojiList.spec.js.snap b/src/components/GitmojiList/__tests__/__snapshots__/gitmojiList.spec.js.snap index 048a46c..dbcc646 100644 --- a/src/components/GitmojiList/__tests__/__snapshots__/gitmojiList.spec.js.snap +++ b/src/components/GitmojiList/__tests__/__snapshots__/gitmojiList.spec.js.snap @@ -15,8 +15,8 @@ exports[`GitmojiList should render the component 1`] = ` className="art emoji-header" > 🎨 @@ -24,9 +24,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :art: - +
+ + :art: + +

Improving structure / format of the code.

@@ -43,8 +48,8 @@ exports[`GitmojiList should render the component 1`] = ` className="zap emoji-header" > ⚑️ @@ -52,9 +57,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :zap: - +
+ + :zap: + +

Improving performance.

@@ -71,8 +81,8 @@ exports[`GitmojiList should render the component 1`] = ` className="fire emoji-header" > πŸ”₯ @@ -80,9 +90,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :fire: - +
+ + :fire: + +

Removing code or files.

@@ -99,8 +114,8 @@ exports[`GitmojiList should render the component 1`] = ` className="bug emoji-header" > πŸ› @@ -108,9 +123,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :bug: - +
+ + :bug: + +

Fixing a bug.

@@ -127,8 +147,8 @@ exports[`GitmojiList should render the component 1`] = ` className="ambulance emoji-header" > πŸš‘ @@ -136,9 +156,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :ambulance: - +
+ + :ambulance: + +

Critical hotfix.

@@ -155,8 +180,8 @@ exports[`GitmojiList should render the component 1`] = ` className="sparkles emoji-header" > ✨ @@ -164,9 +189,14 @@ exports[`GitmojiList should render the component 1`] = `
- - :sparkles: - +
+ + :sparkles: + +

Introducing new features.

diff --git a/src/components/GitmojiList/index.js b/src/components/GitmojiList/index.js index c2e3186..932cae5 100644 --- a/src/components/GitmojiList/index.js +++ b/src/components/GitmojiList/index.js @@ -15,13 +15,20 @@ type Props = { const GitmojiList = (props: Props) => { React.useEffect(() => { - const clipboard = new Clipboard('.gitmoji') + const clipboard = new Clipboard('.gitmoji-code, .gitmoji-emoji') - clipboard.on('success', function() { + clipboard.on('success', function(e) { window.ga('send', 'event', 'Gitmoji', 'Copy to Clipboard') + const elementClasses = e.trigger.classList + let notificationMessage = `

Hey! Gitmoji ${e.text} copied to the clipboard 😜

` + + if (elementClasses.contains('gitmoji-emoji')) { + notificationMessage = `

Hey! Gitmoji emoji ${e.text} copied to the clipboard 😜

` + } + var notification = new window.NotificationFx({ - message: '

Hey! Gitmoji copied to the clipboard 😜

', + message: notificationMessage, layout: 'growl', effect: 'scale', type: 'notice' diff --git a/src/styles/_includes/_notifications.scss b/src/styles/_includes/_notifications.scss index a9713ef..2f8507b 100644 --- a/src/styles/_includes/_notifications.scss +++ b/src/styles/_includes/_notifications.scss @@ -28,6 +28,13 @@ margin: 0; } + .gitmoji-code { + padding: 0 4px; + border-radius: 4px; + background-color: rgba($black, 0.7); + color: $white; + } + &.ns-show, &.ns-visible { pointer-events: auto; @@ -84,7 +91,7 @@ .ns-growl { top: 30px; left: 30px; - max-width: 300px; + max-width: 350px; border-radius: 5px; } @@ -135,6 +142,7 @@ opacity: 0; -webkit-transform: translate3d(0, 40px, 0) scale3d(0.1, 0.6, 1); } + 100% { opacity: 1; -webkit-transform: translate3d(0, 0, 0) scale3d(1, 1, 1); @@ -147,6 +155,7 @@ -webkit-transform: translate3d(0, 40px, 0) scale3d(0.1, 0.6, 1); transform: translate3d(0, 40px, 0) scale3d(0.1, 0.6, 1); } + 100% { opacity: 1; -webkit-transform: translate3d(0, 0, 0) scale3d(1, 1, 1); diff --git a/src/styles/style.scss b/src/styles/style.scss index e1f5ecd..61a5a44 100644 --- a/src/styles/style.scss +++ b/src/styles/style.scss @@ -130,10 +130,25 @@ main.wrap { box-sizing: border-box; .gitmoji { - font-size: 5em; - cursor: pointer; - font-family: 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', - 'Segoe UI Symbol', 'Android Emoji', 'EmojiSymbols'; + &-emoji { + display: inline-block; + font-size: 5em; + cursor: pointer; + font-family: 'Apple Color Emoji', 'Segoe UI Emoji', 'Noto Color Emoji', + 'Segoe UI Symbol', 'Android Emoji', 'EmojiSymbols'; + + &:hover { + animation-name: bounce; + animation-duration: 0.5s; + } + } + + &-code { + border-radius: 4px; + transition-duration: 0.3s; + border-bottom: solid 2px rgba(0, 0, 0, 0); + cursor: pointer; + } } &-card { @@ -257,6 +272,13 @@ main.wrap { @each $gitmoji, $color in ($gitmojis) { .#{$gitmoji} { background-color: $color; + + & ~ .emoji-info .gitmoji-code { + &:hover { + background-color: rgba($color, 0.3); + box-shadow: 0 4px rgba($color, 0.6); + } + } } } @@ -265,19 +287,54 @@ main.wrap { 100% { color: #7ccdea; } + 16% { color: #0074d9; } + 32% { color: #2ecc40; } + 48% { color: #ffdc00; } + 64% { color: #b10dc9; } + 80% { color: #ff4136; } } + +/* + This code has been obtained from: + https://github.com/daneden/animate.css/blob/master/source/attention_seekers/bounce.css +*/ +@keyframes bounce { + from, + 20%, + 53%, + 80%, + to { + animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1); + transform: translate3d(0, 0, 0); + } + + 40%, + 43% { + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + transform: translate3d(0, -9px, 0); + } + + 70% { + animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06); + transform: translate3d(0, -5px, 0); + } + + 90% { + transform: translate3d(0, -2px, 0); + } +}