diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-01-26 17:42:52 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-27 14:11:12 -0500 |
| commit | 33e7ab9f2ff1fb09e1c0928217da34652a949bae (patch) | |
| tree | bb8de33a9773dc785fe42c5a89dd8796fb96bc92 | |
| parent | 30e76a651eead26679b9635b6019f7b4872597cf (diff) | |
| download | gitlab-ce-33e7ab9f2ff1fb09e1c0928217da34652a949bae.tar.gz | |
Merge branch 'correct-issue-filter-dropdown-user-avatar-stretch' into 'master'
Fixed flexbox and wrap issues
See merge request !8745
| -rw-r--r-- | app/assets/stylesheets/framework/avatar.scss | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/filters.scss | 9 |
3 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss index 8392b98f0a7..1d59700543c 100644 --- a/app/assets/stylesheets/framework/avatar.scss +++ b/app/assets/stylesheets/framework/avatar.scss @@ -37,6 +37,8 @@ display: inline-block; margin-left: 4px; margin-bottom: 2px; + flex-shrink: 0; + -webkit-flex-shrink: 0; &.s16 { margin-right: 4px; } &.s24 { margin-right: 4px; } diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index 755eddefa42..6bfb9a6d1cb 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -125,7 +125,8 @@ top: 100%; left: 0; z-index: 9; - width: 240px; + max-width: 280px; + min-width: 240px; margin-top: 2px; margin-bottom: 0; font-size: 14px; diff --git a/app/assets/stylesheets/framework/filters.scss b/app/assets/stylesheets/framework/filters.scss index 4b05ec691a8..e3da467a27c 100644 --- a/app/assets/stylesheets/framework/filters.scss +++ b/app/assets/stylesheets/framework/filters.scss @@ -132,6 +132,11 @@ display: flex; -webkit-flex-direction: column; flex-direction: column; + + &> span { + white-space: normal; + word-break: break-all; + } } } @@ -141,10 +146,6 @@ } } -.hint-dropdown { - width: 250px; -} - .filter-dropdown-loading { padding: 8px 16px; } |