Commit a65b319d authored by JC Brand's avatar JC Brand

Improve styling for emoji-picker in the converse theme

parent b2a118ca
...@@ -1754,13 +1754,13 @@ ...@@ -1754,13 +1754,13 @@
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker {
box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4); box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4);
z-index: 100; } overflow-x: scroll; }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked {
background-color: #DCF9F6; } background-color: #DCF9F6; }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-picker, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-picker,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-picker { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-picker {
height: 250px; height: 100px;
overflow: scroll; } overflow: scroll; }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul li, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul li,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul li { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul li {
...@@ -1841,6 +1841,14 @@ ...@@ -1841,6 +1841,14 @@
#conversejs .chat-head { #conversejs .chat-head {
border-top-left-radius: 0; border-top-left-radius: 0;
border-top-right-radius: 0; } } border-top-right-radius: 0; } }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker {
display: table;
table-layout: fixed;
width: 100%; }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .emoji-category,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .emoji-category {
display: table-cell; }
#conversejs #controlbox { #conversejs #controlbox {
margin-right: 1em; } margin-right: 1em; }
......
...@@ -1800,7 +1800,7 @@ body { ...@@ -1800,7 +1800,7 @@ body {
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker {
box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4); box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4);
z-index: 100; } overflow-x: scroll; }
#converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked, #converse-embedded-chat .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked,
#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked { #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li .toolbar-menu ul.emoji-category-picker .picked {
background-color: #DCF9F6; } background-color: #DCF9F6; }
......
...@@ -296,6 +296,7 @@ ...@@ -296,6 +296,7 @@
.toggle-occupants, .toggle-occupants,
.toggle-clear, .toggle-clear,
.toggle-otr { .toggle-otr {
float: right; float: right;
} }
li { li {
...@@ -321,13 +322,13 @@ ...@@ -321,13 +322,13 @@
ul { ul {
&.emoji-category-picker { &.emoji-category-picker {
box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4); box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4);
z-index: 100; overflow-x: scroll;
.picked { .picked {
background-color: $highlight-color; background-color: $highlight-color;
} }
} }
&.emoji-picker { &.emoji-picker {
height: 250px; height: $emoji-picker-height;
overflow: scroll; overflow: scroll;
} }
li { li {
......
...@@ -12,4 +12,25 @@ ...@@ -12,4 +12,25 @@
border-top-right-radius: 0; border-top-right-radius: 0;
} }
} }
.chatbox {
form.sendXMPPMessage {
.chat-toolbar {
li {
.toolbar-menu {
ul {
&.emoji-category-picker {
display: table;
table-layout: fixed;
width: 100%;
.emoji-category {
display: table-cell;
}
}
}
}
}
}
}
}
} }
...@@ -100,6 +100,8 @@ $legend-font-size: 16px !default; ...@@ -100,6 +100,8 @@ $legend-font-size: 16px !default;
$toolbar-height: 25px !default; $toolbar-height: 25px !default;
$toolbar-color: $greenish-white !default; $toolbar-color: $greenish-white !default;
$emoji-picker-height: 100px !default;
$line-height-small: 14px !default; $line-height-small: 14px !default;
$line-height: 16px !default; $line-height: 16px !default;
......
...@@ -103,6 +103,8 @@ $legend-font-size: 18px !default; ...@@ -103,6 +103,8 @@ $legend-font-size: 18px !default;
$toolbar-height: 29px !default; $toolbar-height: 29px !default;
$toolbar-color: $greenish-white !default; $toolbar-color: $greenish-white !default;
$emoji-picker-height: 250px !default;
$line-height-small: 20px !default; $line-height-small: 20px !default;
$line-height: 22px !default; $line-height: 22px !default;
......
...@@ -612,7 +612,7 @@ ...@@ -612,7 +612,7 @@
const excluded_substrings = [ const excluded_substrings = [
':woman', ':man', ':women_', ':men_', '_man_', '_woman_', '_woman:', '_man:' ':woman', ':man', ':women_', ':men_', '_man_', '_woman_', '_woman:', '_man:'
]; ];
const excluded_categories = ['modifier']; const excluded_categories = ['modifier', 'regional'];
const categories = _.difference( const categories = _.difference(
_.uniq(_.map(emojis, _.partial(_.get, _, 'category'))), _.uniq(_.map(emojis, _.partial(_.get, _, 'category'))),
excluded_categories excluded_categories
...@@ -634,6 +634,8 @@ ...@@ -634,6 +634,8 @@
list = _.union(_.slice(list, 24-1), _.slice(list, 0, 24)); list = _.union(_.slice(list, 24-1), _.slice(list, 0, 24));
} else if (cat === 'travel') { } else if (cat === 'travel') {
list = _.union(_.slice(list, 17-1), _.slice(list, 0, 17)); list = _.union(_.slice(list, 17-1), _.slice(list, 0, 17));
} else if (cat === 'symbols') {
list = _.union(_.slice(list, 60-1), _.slice(list, 0, 60));
} }
emojis_by_category[cat] = list; emojis_by_category[cat] = list;
}); });
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment