diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-03 15:30:10 -0200 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2015-12-03 15:30:10 -0200 |
| commit | c204aca83b0c8308080a9f53b692f509a80ddffc (patch) | |
| tree | 1553366ef46f0d462908d67422e0dfb9ee4dac5d | |
| parent | f1bbd8119db3e494e662cd219a9882e5e17bf4bc (diff) | |
| download | gitlab-ce-c204aca83b0c8308080a9f53b692f509a80ddffc.tar.gz | |
Improve style of the warning when mentioning many people in a comment
| -rw-r--r-- | app/assets/stylesheets/framework/markdown_area.scss | 8 | ||||
| -rw-r--r-- | app/views/projects/_md_preview.html.haml | 15 |
2 files changed, 11 insertions, 12 deletions
diff --git a/app/assets/stylesheets/framework/markdown_area.scss b/app/assets/stylesheets/framework/markdown_area.scss index cc660529cb4..11b609f3b79 100644 --- a/app/assets/stylesheets/framework/markdown_area.scss +++ b/app/assets/stylesheets/framework/markdown_area.scss @@ -73,11 +73,9 @@ } .referenced-users { - padding: 10px 0; - color: #999; - margin-left: 10px; - margin-top: 1px; - margin-right: 130px; + color: #4c4e54; + display: inline-block; + padding-top: 10px; } .md-preview-holder { diff --git a/app/views/projects/_md_preview.html.haml b/app/views/projects/_md_preview.html.haml index c4d3c9cc30a..5bdceb9523a 100644 --- a/app/views/projects/_md_preview.html.haml +++ b/app/views/projects/_md_preview.html.haml @@ -15,10 +15,11 @@ .js-md-preview{class: (preview_class if defined?(preview_class))} - if defined?(referenced_users) && referenced_users - %span.referenced-users.pull-left.hide - = icon('exclamation-triangle') - You are about to add - %strong - %span.js-referenced-users-count 0 - people - to the discussion. Proceed with caution. + %div.clearfix + %span.referenced-users.hide + = icon('exclamation-triangle') + You are about to add + %strong + %span.js-referenced-users-count 0 + people + to the discussion. Proceed with caution. |