BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a510d9bd
Unverified
Commit
a510d9bd
authored
Sep 27, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct disabled note form style
parent
1ae29851
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
30 additions
and
7 deletions
+30
-7
issue_discussion_locked_widget.vue
...ripts/notes/components/issue_discussion_locked_widget.vue
+7
-2
note_form.scss
app/assets/stylesheets/pages/note_form.scss
+16
-0
_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+7
-5
No files found.
app/assets/javascripts/notes/components/issue_discussion_locked_widget.vue
View file @
a510d9bd
<
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
>
app/assets/stylesheets/pages/note_form.scss
View file @
a510d9bd
...
...
@@ -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
;
...
...
app/views/shared/notes/_notes_with_form.html.haml
View file @
a510d9bd
...
...
@@ -27,9 +27,11 @@
-
elsif
discussion_locked
.disabled-comment.text-center.prepend-top-default
%span
.issuable-note-warning
This
=
issuable
.
class
.
to_s
.
titleize
.
downcase
is locked. Only
%b
project members
can comment.
%span
.icon
=
sprite_icon
(
'lock'
,
size:
14
)
%span
This
=
issuable
.
class
.
to_s
.
titleize
.
downcase
is locked. Only
%b
project members
can comment.
%script
.js-notes-data
{
type:
"application/json"
}=
initial_notes_data
(
autocomplete
).
to_json
.
html_safe
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment