diff options
| author | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2016-06-13 15:29:24 -0400 |
| commit | 5af526c259d9c6477d67eb8f8a1e7b86270c7294 (patch) | |
| tree | 97cc595107026a1f19d6fd6e35627dda23979aa3 /webapp/sass | |
| parent | bb5ca5a8780f9259306d881e85760de8b87ddea8 (diff) | |
| parent | 974238231b9cdbd39a825ec8e9299fbb0b51f6b8 (diff) | |
| download | chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.gz chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.tar.bz2 chat-5af526c259d9c6477d67eb8f8a1e7b86270c7294.zip | |
Merge branch 'release-3.1'
Conflicts:
webapp/components/create_comment.jsx
Diffstat (limited to 'webapp/sass')
| -rw-r--r-- | webapp/sass/components/_mentions.scss | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/webapp/sass/components/_mentions.scss b/webapp/sass/components/_mentions.scss index 9e47e2a71..82f626eaf 100644 --- a/webapp/sass/components/_mentions.scss +++ b/webapp/sass/components/_mentions.scss @@ -13,10 +13,10 @@ @include clearfix; cursor: pointer; font-size: 13px; - height: 36px; - line-height: 36px; - margin: 5px 0; - padding: 2px; + height: 39px; + line-height: 35px; + margin: 0; + padding: 3px 8px; position: relative; white-space: nowrap; width: 100%; |