tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update to emoji-mart 2.10.0 (#10281)

Browse Source 
* fix: update to emoji-mart 2.10.0

* remove useless change

* fix CSS style of emoji picker, improve a11y

* fix missing newline in scss

* fix the title and input fonts
This commit is contained in:
Nolan Lawson
2019-03-16 12:13:15 -07:00
committed by Eugen Rochko
parent 6a3f08661f
commit db06b25376
7 changed files with 82 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/styles/mastodon/components.scss
View File

@ -3339,11 +3339,11 @@ a.status-card.compact:hover {
box-shadow: 1px 2px 6px rgba($base-shadow-color, 0.2);
overflow: hidden;
button {
li {
display: block;
cursor: pointer;
border: 0;
padding: 4px 8px;
padding: 3px 8px;
background: transparent;
&:hover,

25
app/javascript/styles/mastodon/emoji_picker.scss
View File

@ -1,3 +1,5 @@
@import '../../../node_modules/emoji-mart/css/emoji-mart.css';
.emoji-mart {
&,
* {
@ -51,6 +53,14 @@
&:hover {
color: darken($lighter-text-color, 4%);
svg {
fill: darken($lighter-text-color, 4%);
}
}
svg {
fill: $lighter-text-color;
}
}
@ -59,11 +69,19 @@
&:hover {
color: darken($highlight-text-color, 4%);
svg {
fill: darken($highlight-text-color, 4%);
}
}
.emoji-mart-anchor-bar {
bottom: -1px;
}
svg {
fill: $highlight-text-color;
}
}
.emoji-mart-anchor-bar {
@ -83,7 +101,6 @@
}
svg {
fill: currentColor;
max-height: 18px;
}
}
@ -103,15 +120,14 @@
}
.emoji-mart-search {
padding: 10px;
padding-right: 45px;
margin: 10px 40px 10px 5px;
background: $simple-background-color;
input {
font-size: 14px;
font-weight: 400;
padding: 7px 9px;
font-family: inherit;
font-family: $font-sans-serif;
display: block;
width: 100%;
background: rgba($ui-secondary-color, 0.3);
@ -166,6 +182,7 @@
font-weight: 500;
padding: 5px 6px;
background: $simple-background-color;
font-family: $font-sans-serif;
}
}