diff options
| author | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-17 16:29:26 +0000 |
| commit | 7f266c19511171f509ae8a60170de10c8d10b41e (patch) | |
| tree | 04cd68ac4722313abec3ea47cc7cda229e463b1d /webapp/sass/components | |
| parent | bfae88e60c7a623afae82e06ce1421ca778c06e7 (diff) | |
| parent | 8568afe5b4fb4d26b14fbc0d21f088eaa490b314 (diff) | |
| download | chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.gz chat-7f266c19511171f509ae8a60170de10c8d10b41e.tar.bz2 chat-7f266c19511171f509ae8a60170de10c8d10b41e.zip | |
Merge branch 'release-3.7' into master.
Diffstat (limited to 'webapp/sass/components')
| -rw-r--r-- | webapp/sass/components/_modal.scss | 2 | ||||
| -rw-r--r-- | webapp/sass/components/_multi-select.scss | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/webapp/sass/components/_modal.scss b/webapp/sass/components/_modal.scss index 3698e8dc9..bfc082ad3 100644 --- a/webapp/sass/components/_modal.scss +++ b/webapp/sass/components/_modal.scss @@ -566,7 +566,7 @@ .more-modal__actions { flex-grow: 0; flex-shrink: 0; - margin: 5px 0 10px; + margin: 5px 0; padding-left: 20px; } diff --git a/webapp/sass/components/_multi-select.scss b/webapp/sass/components/_multi-select.scss index a33116aa4..beceb7b9c 100644 --- a/webapp/sass/components/_multi-select.scss +++ b/webapp/sass/components/_multi-select.scss @@ -29,7 +29,6 @@ .Select-value-label { overflow: hidden; - text-overflow: ellipsis; } } |