Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
a65b319d
Commit
a65b319d
authored
Jul 15, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve styling for emoji-picker in the converse theme
parent
b2a118ca
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
42 additions
and
6 deletions
+42
-6
css/converse.css
css/converse.css
+10
-2
css/inverse.css
css/inverse.css
+1
-1
sass/_chatbox.scss
sass/_chatbox.scss
+3
-2
sass/converse/_chatbox.scss
sass/converse/_chatbox.scss
+21
-0
sass/converse/_variables.scss
sass/converse/_variables.scss
+2
-0
sass/inverse/_variables.scss
sass/inverse/_variables.scss
+2
-0
src/utils.js
src/utils.js
+3
-1
No files found.
css/converse.css
View file @
a65b319d
...
@@ -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
:
25
0px
;
height
:
10
0px
;
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
;
}
...
...
css/inverse.css
View file @
a65b319d
...
@@ -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
;
}
...
...
sass/_chatbox.scss
View file @
a65b319d
...
@@ -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
{
...
...
sass/converse/_chatbox.scss
View file @
a65b319d
...
@@ -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
;
}
}
}
}
}
}
}
}
}
}
sass/converse/_variables.scss
View file @
a65b319d
...
@@ -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
;
...
...
sass/inverse/_variables.scss
View file @
a65b319d
...
@@ -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
;
...
...
src/utils.js
View file @
a65b319d
...
@@ -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
;
});
});
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment