Commit 4c353143 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'style-warning-about-mentioning-many-people-in-a-comment' into 'master'

Style warning about mentioning many people in a comment

Fixes #2885 

* Create issue:

    Before:

    ![Screenshot_2015-12-03_15.23.44](/uploads/6da9b326e47dc5e8c127a581af99403c/Screenshot_2015-12-03_15.23.44.png)

    After:

    ![Screenshot_2015-12-03_15.21.29](/uploads/bbe328d30a32d642c280bf2ad6d2832c/Screenshot_2015-12-03_15.21.29.png)  
      

* New merge request:

    Before:

    ![Screenshot_2015-12-03_15.24.06](/uploads/79d6f8f52ba2753aaecf6b6bbd04f0d0/Screenshot_2015-12-03_15.24.06.png)

    After:

    ![Screenshot_2015-12-03_15.21.48](/uploads/f01ea8e7d058a9f8b803ca1ce4f533ad/Screenshot_2015-12-03_15.21.48.png)
     

* New comment in a merge request:

    Before:

    ![Screenshot_2015-12-03_15.11.23](/uploads/5d958375812d21d41e00694186c7ef7a/Screenshot_2015-12-03_15.11.23.png)

    After:

    ![Screenshot_2015-12-03_15.09.08](/uploads/3d6bde6aad46c7d9e53b70a47eecf7c0/Screenshot_2015-12-03_15.09.08.png)
     

* New diff comment:

    Before:

    ![Screenshot_2015-12-03_15.25.50](/uploads/08ac9c261c1aa9693706da714c121e15/Screenshot_2015-12-03_15.25.50.png)

    After:

    ![Screenshot_2015-12-03_15.46.20](/uploads/07a8b8708ad825eb8cda7e5e40116b81/Screenshot_2015-12-03_15.46.20.png)

See merge request !1971
parents 839a8b92 29e55067
...@@ -7,6 +7,7 @@ v 8.3.0 (unreleased) ...@@ -7,6 +7,7 @@ v 8.3.0 (unreleased)
- Recognize issue/MR/snippet/commit links as references - Recognize issue/MR/snippet/commit links as references
- Add ignore whitespace change option to commit view - Add ignore whitespace change option to commit view
- Fire update hook from GitLab - Fire update hook from GitLab
- Style warning about mentioning many people in a comment
- Don't show project fork event as "imported" - Don't show project fork event as "imported"
- Add API endpoint to fetch merge request commits list - Add API endpoint to fetch merge request commits list
- Expose events API with comment information and author info - Expose events API with comment information and author info
......
...@@ -73,11 +73,8 @@ ...@@ -73,11 +73,8 @@
} }
.referenced-users { .referenced-users {
padding: 10px 0; color: #4c4e54;
color: #999; padding-top: 10px;
margin-left: 10px;
margin-top: 1px;
margin-right: 130px;
} }
.md-preview-holder { .md-preview-holder {
......
...@@ -8,17 +8,18 @@ ...@@ -8,17 +8,18 @@
%a.js-md-preview-button(href="#md-preview-holder" tabindex="-1") %a.js-md-preview-button(href="#md-preview-holder" tabindex="-1")
Preview Preview
%div
.md-write-holder
= yield
.md.md-preview-holder.hide
.js-md-preview{class: (preview_class if defined?(preview_class))}
- if defined?(referenced_users) && referenced_users - if defined?(referenced_users) && referenced_users
%span.referenced-users.pull-left.hide %div.referenced-users.hide
%span
= icon('exclamation-triangle') = icon('exclamation-triangle')
You are about to add You are about to add
%strong %strong
%span.js-referenced-users-count 0 %span.js-referenced-users-count 0
people people
to the discussion. Proceed with caution. to the discussion. Proceed with caution.
%div
.md-write-holder
= yield
.md.md-preview-holder.hide
.js-md-preview{class: (preview_class if defined?(preview_class))}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment