diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-27 15:46:09 +0100 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-09-27 15:46:09 +0100 |
commit | a510d9bdfb3d5a524a62388980cfa0a552bbefb7 (patch) | |
tree | c939544b544646a94ef7b8af2a54144a689afc93 /app/assets | |
parent | 1ae29851d0f7e18933029c46d560bbc3adca4357 (diff) | |
download | gitlab-ce-a510d9bdfb3d5a524a62388980cfa0a552bbefb7.tar.gz |
Correct disabled note form style18608-lock-issues
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue | 9 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/note_form.scss | 16 |
2 files changed, 23 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue b/app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue index fa2ff6e5c58..f0429b82aaa 100644 --- a/app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue +++ b/app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue @@ -1,6 +1,10 @@ <script> export default { - name: 'discussionLockedWidget', + computed: { + icon() { + return gl.utils.spriteIcon('lock'); + }, + }, }; </script> @@ -8,7 +12,8 @@ <template> <div class="disabled-comment text-center"> <span class="issuable-note-warning"> - This issue is locked. Only <b>project members</b> can comment. + <span class="icon" v-html="icon"></span> + <span>This issue is locked. Only <b>project members</b> can comment.</span> </span> </div> </template> diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss index 8b7d42214e6..5b93ff5ce14 100644 --- a/app/assets/stylesheets/pages/note_form.scss +++ b/app/assets/stylesheets/pages/note_form.scss @@ -112,6 +112,22 @@ align-items: center; } +.disabled-comment .issuable-note-warning { + border: none; + border-radius: $label-border-radius; + padding-top: $gl-vert-padding; + padding-bottom: $gl-vert-padding; + + .icon svg { + position: relative; + top: 2px; + margin-right: $btn-xs-side-margin; + width: $gl-font-size; + height: $gl-font-size; + fill: $orange-600; + } +} + .sidebar-item-value { .fa { background-color: inherit; |