Skip to content

Commit

Permalink
Add support for Emoji 5 (#1797)
Browse files Browse the repository at this point in the history
* Add support for Emoji 5

Update to latest emoji-datasource and emoji-js and switch to an up-to-date fork
of emoji-panel.

// FREEBIE

* Dark theme support for emoji-panel

Fixes #1763

// FREEBIE
  • Loading branch information
liliakai authored and scottnonnenberg committed Nov 27, 2017
1 parent 89297af commit 9c7ba87
Show file tree
Hide file tree
Showing 6 changed files with 3,441 additions and 2,612 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,9 @@
"electron-config": "^1.0.0",
"electron-editor-context-menu": "^1.1.1",
"electron-updater": "^2.16.1",
"emoji-datasource-apple": "^3.0.0",
"emoji-js": "^3.2.2",
"emoji-panel": "^0.5.2",
"emoji-datasource-apple": "^4.0.0",
"emoji-js": "^3.4.0",
"emoji-panel": "https://github.com/liliakai/emoji-panel.git#4e6bdd8",
"google-libphonenumber": "^3.0.7",
"lodash": "^4.17.4",
"mkdirp": "^0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion stylesheets/_emoji.scss
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ button.emoji {
height: 0px;
.ep-e {
background-image: url('../node_modules/emoji-datasource/sheet_apple_64.png');
background-size: 1312px;
background-size: 1734px;
}
.ep-slide {
background-color: $blue;
Expand Down
19 changes: 18 additions & 1 deletion stylesheets/android-dark.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ $text-dark_l2: darken($text-dark, 30%);
color: $text-dark;
}
}
button, .confirmation-dialog .content .buttons button {
.confirmation-dialog .content .buttons button {
background-color: $button-dark;
border: 1px solid $grey-dark_l2;
&:hover {
Expand Down Expand Up @@ -290,4 +290,21 @@ $text-dark_l2: darken($text-dark, 30%);
.capture-audio button:hover {
background-color: $grey-dark;
}
button.emoji {
&:hover {
background-color: $grey-dark;
}
&:before {
@include color-svg('../images/smile.svg', white);
}
}

.emoji-panel-container {
.ep-categories {
background-color: $grey-dark_l3;
}
.ep-emojies {
background-color: $grey-dark_l2;
}
}
}
Loading

0 comments on commit 9c7ba87

Please sign in to comment.