diff options
author | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-12-08 13:02:33 -0800 |
commit | 69ecfe4cb1763b10f1690b543ee1828aed94aefa (patch) | |
tree | 53c70c2984b2e4144d3cc0e539ef1b52b8eb4552 /web/sass-files/sass/partials/_settings.scss | |
parent | 8b29404525f036633be6b25dc18c536d2aafee02 (diff) | |
parent | 90791dd98ea0f26439a13c1ec05a610514988b5c (diff) | |
download | chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.gz chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.bz2 chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.zip |
Fixing merge
Diffstat (limited to 'web/sass-files/sass/partials/_settings.scss')
-rw-r--r-- | web/sass-files/sass/partials/_settings.scss | 25 |
1 files changed, 18 insertions, 7 deletions
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss index ee0c40067..f078cafb4 100644 --- a/web/sass-files/sass/partials/_settings.scss +++ b/web/sass-files/sass/partials/_settings.scss @@ -135,9 +135,10 @@ .input-group-addon { padding: 4px 5px; width: 40px; - img { - border: 1px solid rgba(black, 0.15); - } + } + img { + border: 1px solid rgba(black, 0.15); + width: 29px; } } .premade-themes { @@ -325,12 +326,22 @@ overflow: hidden; text-overflow: ellipsis; } +} + +.member-role, .member-drop { + position:absolute; + right: 15px; + top: 8px; + + .fa { + margin-right: 5px; + } - .member-role, .member-drop { - position:absolute; - right: 15px; - top: 8px; + .member-menu { + top: -50%; + right: 110%; } + } .member-invite { |