discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-06 11:19:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

tweaks to copy and styles

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2017-07-21 14:19:04 +02:00
parent 79c8b505e8
commit c7f2b0fe58
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/templates/emoji-picker.raw.hbs.erb
View File

@ -37,7 +37,7 @@
<div class='section' data-section='recent'> <div class='section' data-section='recent'>
<div class='section-header'> <div class='section-header'>
<span class="title">{{i18n 'emoji_picker.recent'}}</span> <span class="title">{{i18n 'emoji_picker.recent'}}</span>
<a href='#' class='clear-recent btn btn-default'>{{fa-icon 'trash'}}</a> <a href='#' class='clear-recent'>{{fa-icon 'trash'}}</a>
</div> </div>
<div class='section-group'></div> <div class='section-group'></div>
</div> </div>

8
app/assets/stylesheets/common/base/emoji.scss
View File

@ -68,6 +68,12 @@
.emoji-picker .section-header .clear-recent .fa{ .emoji-picker .section-header .clear-recent .fa{
margin: 0; margin: 0;
padding: 0;
color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
&:hover {
color: $primary;
}
} }
.emoji-picker .section-group { .emoji-picker .section-group {
@ -171,7 +177,7 @@ body img.emoji {
} }
.emoji-picker .filter .fa.fa-search { .emoji-picker .filter .fa.fa-search {
color: $primary; color: dark-light-choose(scale-color($header_primary, $lightness: 50%), $header_primary);
font-size: 16px; font-size: 16px;
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;

4
config/locales/client.en.yml
View File

@ -1135,7 +1135,7 @@ en:
alt: 'Alt' alt: 'Alt'
emoji_picker: emoji_picker:
filter_placeholder: Search an emoji filter_placeholder: Search for emoji
people: People people: People
nature: Nature nature: Nature
food: Food food: Food
@ -1144,7 +1144,7 @@ en:
objects: Objects objects: Objects
celebration: Celebration celebration: Celebration
custom: Custom emojis custom: Custom emojis
recent: Recently used emojis recent: Recently used
composer: composer:
emoji: "Emoji :)" emoji: "Emoji :)"