diff options
| author | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-20 00:15:55 -0500 |
|---|---|---|
| committer | Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home> | 2016-01-20 00:15:55 -0500 |
| commit | 3278c5b073a1f3e6d48f246525178863959203af (patch) | |
| tree | e291e6ab869422fc0d3f31d90c979329c8b24284 | |
| parent | a382ad99efd4c792f70705d386b2be688b667f24 (diff) | |
| download | gitlab-ce-3278c5b073a1f3e6d48f246525178863959203af.tar.gz | |
Adds disabled comment field and disabled avatar.
| -rw-r--r-- | app/assets/stylesheets/pages/merge_requests.scss | 36 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 10 |
2 files changed, 46 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss index 75f2ae80a92..6c1272d5d8c 100644 --- a/app/assets/stylesheets/pages/merge_requests.scss +++ b/app/assets/stylesheets/pages/merge_requests.scss @@ -201,3 +201,39 @@ .mr-source-target { line-height: 31px; } + +.disabled-comment-area { + padding: 16px 0; + + .disabled-profile { + width: 40px; + height: 40px; + background: #CCC; + border-radius: 20px; + display: inline-block; + margin-right: 10px; + } + + .disabled-comment { + background: #F3F3F3; + display: inline-block; + vertical-align: top; + height: 200px; + border-radius: 4px; + border: 1px solid #CCC; + padding-top: 90px; + text-align: center; + right: 20px; + position: absolute; + left: 70px; + margin-bottom: 20px; + + span { + color: #B2B2B2; + + a { + color: $md-link-color; + } + } + } +}
\ No newline at end of file diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index eb378b42603..910eb6cf66e 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -5,6 +5,16 @@ .js-main-target-form - if can? current_user, :create_note, @project = render "projects/notes/form", view: diff_view +- else + .disabled-comment-area + .disabled-profile + .disabled-comment + %span + Please + = link_to "register",new_user_session_path + or + = link_to "login",new_user_session_path + to post a comment :javascript var notes = new Notes("#{namespace_project_notes_path(namespace_id: @project.namespace, target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, #{Time.now.to_i}, "#{diff_view}") |