diff options
author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /webapp/sass/components | |
parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip |
Merge branch 'release-4.0'
Diffstat (limited to 'webapp/sass/components')
-rw-r--r-- | webapp/sass/components/_emoticons.scss | 7 | ||||
-rw-r--r-- | webapp/sass/components/_popover.scss | 1 | ||||
-rw-r--r-- | webapp/sass/components/_search.scss | 4 | ||||
-rw-r--r-- | webapp/sass/components/_status-icon.scss | 8 | ||||
-rw-r--r-- | webapp/sass/components/_webrtc.scss | 5 |
5 files changed, 12 insertions, 13 deletions
diff --git a/webapp/sass/components/_emoticons.scss b/webapp/sass/components/_emoticons.scss index b91630a47..c8fd50226 100644 --- a/webapp/sass/components/_emoticons.scss +++ b/webapp/sass/components/_emoticons.scss @@ -80,6 +80,8 @@ .emoji-picker__search-container { position: relative; + border-top-style: solid; + border-top-width: 1px; .emoji-picker__search-icon { padding-left: 6px; @@ -89,8 +91,7 @@ } .emoji-picker__search { - border-width: 1px 0px 1px 0px; - border-style: solid; + border-width: 0px; padding: 2px 0 2px 25px; width: 100%; height: 25px; @@ -108,6 +109,8 @@ overflow-y: auto; padding: 0px 8px 8px 8px; position: relative; + border-top-style: solid; + border-top-width: 1px; .emoji-picker__category-header { font-size: 12px; diff --git a/webapp/sass/components/_popover.scss b/webapp/sass/components/_popover.scss index 46e83f32d..90573c7ec 100644 --- a/webapp/sass/components/_popover.scss +++ b/webapp/sass/components/_popover.scss @@ -242,6 +242,7 @@ border-top: 1px solid; cursor: pointer; height: 45px; + overflow: hidden; padding: 5px 19px 5px 17px; &:hover { diff --git a/webapp/sass/components/_search.scss b/webapp/sass/components/_search.scss index e7fab0290..c9b8d4c02 100644 --- a/webapp/sass/components/_search.scss +++ b/webapp/sass/components/_search.scss @@ -78,8 +78,8 @@ top: 27px; .search-bar__container & { - right: 7px; - top: 8px; + right: 12px; + top: 11px; } } } diff --git a/webapp/sass/components/_status-icon.scss b/webapp/sass/components/_status-icon.scss index 03d9d0705..022cffa69 100644 --- a/webapp/sass/components/_status-icon.scss +++ b/webapp/sass/components/_status-icon.scss @@ -49,14 +49,14 @@ &.status--group { border-radius: 2px; - font-size: 11px; + font-size: 10px; font-weight: 600; - height: 16px; + height: 15px; left: 1px; - line-height: 15px; + line-height: 14px; margin: 0 9px 0 -1px; text-align: center; - top: -1px; + top: -2px; width: 15px; .mentions__name & { diff --git a/webapp/sass/components/_webrtc.scss b/webapp/sass/components/_webrtc.scss index 839f9c8c1..05ef408e2 100644 --- a/webapp/sass/components/_webrtc.scss +++ b/webapp/sass/components/_webrtc.scss @@ -328,9 +328,4 @@ #videos.small { position: relative; } - - .search__form { - margin-left: 5px; - width: calc(100% - 80px); - } } |