diff options
author | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
---|---|---|
committer | Stas Vovk <stas@vovk.me> | 2015-10-16 14:21:51 +0300 |
commit | 79fcb9808421dd93342a9538d05dd2259f5dd14b (patch) | |
tree | 33a1a865144f280e37fde07a7c91ed8825c53801 /web/sass-files/sass/partials/_base.scss | |
parent | 2bd81ff379acb347534e4d6a1a27624e0262deb0 (diff) | |
parent | 50a8e2bd4fa53c6bb2f12a03237be4fbaf259617 (diff) | |
download | chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.gz chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.tar.bz2 chat-79fcb9808421dd93342a9538d05dd2259f5dd14b.zip |
Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
web/react/utils/constants.jsx
Diffstat (limited to 'web/sass-files/sass/partials/_base.scss')
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index 44a474213..cb5ff67b5 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -39,10 +39,6 @@ img { height: auto; } -.input-group-addon { - background: transparent; -} - .popover { color: #333; &.bottom, &.right, &.top, &.left { @@ -53,6 +49,9 @@ img { .popover-title { background: rgba(black, 0.05); } + .popover-content { + white-space: pre-wrap; + } } .dropdown-menu { @@ -182,6 +181,10 @@ a:focus, a:hover { background-color: white !important; } +.alert { + padding: 8px 12px; +} + .emoji { width: 1.5em; height: 1.5em; |