summaryrefslogtreecommitdiffstats
path: root/webapp/sass
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmood@users.noreply.github.com>2017-05-18 17:57:19 +0500
committerJoram Wilander <jwawilander@gmail.com>2017-05-18 08:57:19 -0400
commitfc58174747cd25eded07c30f5f122d4f8122e7e5 (patch)
treeadf214b31013afacb3a6dba145389466d1519fee /webapp/sass
parent2df5f65f55456a29f6fe75ea533051b99e271756 (diff)
downloadchat-fc58174747cd25eded07c30f5f122d4f8122e7e5.tar.gz
chat-fc58174747cd25eded07c30f5f122d4f8122e7e5.tar.bz2
chat-fc58174747cd25eded07c30f5f122d4f8122e7e5.zip
PLT-6614 - Mentions badge styling and dropdown icon style (#6426)
* Mentions badge styling and dropdown icon style * PLT-6134 - Fixing emoji picker border in RHS
Diffstat (limited to 'webapp/sass')
-rw-r--r--webapp/sass/components/_mentions.scss15
-rw-r--r--webapp/sass/layout/_sidebar-left.scss2
-rw-r--r--webapp/sass/layout/_team-sidebar.scss2
3 files changed, 17 insertions, 2 deletions
diff --git a/webapp/sass/components/_mentions.scss b/webapp/sass/components/_mentions.scss
index 86e7c0a28..17a72e5a9 100644
--- a/webapp/sass/components/_mentions.scss
+++ b/webapp/sass/components/_mentions.scss
@@ -9,6 +9,21 @@
z-index: 10;
}
+.mention-badge {
+ background-color: #777;
+ border-radius: 10px;
+ color: #fff;
+ display: inline-block;
+ font-size: 12px;
+ font-weight: bold;
+ line-height: 1;
+ min-width: 10px;
+ padding: 3px 7px;
+ text-align: center;
+ vertical-align: middle;
+ white-space: nowrap;
+}
+
.mentions__name {
@include clearfix;
cursor: pointer;
diff --git a/webapp/sass/layout/_sidebar-left.scss b/webapp/sass/layout/_sidebar-left.scss
index a7a99249b..25f1d2913 100644
--- a/webapp/sass/layout/_sidebar-left.scss
+++ b/webapp/sass/layout/_sidebar-left.scss
@@ -53,7 +53,7 @@
padding: 1em 1em 0;
}
- .badge {
+ .mention-badge {
background-color: $primary-color;
position: absolute;
right: 10px;
diff --git a/webapp/sass/layout/_team-sidebar.scss b/webapp/sass/layout/_team-sidebar.scss
index cb003c828..9d1cc72f5 100644
--- a/webapp/sass/layout/_team-sidebar.scss
+++ b/webapp/sass/layout/_team-sidebar.scss
@@ -54,7 +54,7 @@
width: 31px;
}
- .badge {
+ .mention-badge {
font-size: 10px;
position: absolute;
right: -6px;