Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
036325711b8e
Unverified
Commit
37e3d42b
authored
Oct 06, 2017
by
Luke "Jared" Bennett
Browse files
UX review
parent
e76de8d0a0be
Changes
5
Hide whitespace changes
Inline
Side-by-side
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
View file @
03632571
...
...
@@ -32,7 +32,7 @@
<div
class=
"issuable-note-warning"
>
<i
aria-hidden=
"true"
class=
"fa"
class=
"fa
icon
"
:class=
"iconClass"
v-if=
"!isLockedAndConfidential"
></i>
...
...
app/assets/stylesheets/framework/variables.scss
View file @
03632571
...
...
@@ -703,3 +703,4 @@ $java: #70ad51;
Issuable warning
*/
$issuable-warning-size
:
24px
;
$issuable-warning-icon-margin
:
4px
;
app/assets/stylesheets/pages/issuable.scss
View file @
03632571
...
...
@@ -14,6 +14,10 @@
width
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
text-align
:
center
;
&
:first-of-type
{
margin-right
:
$issuable-warning-icon-margin
;
}
}
.sidebar-item-icon
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
03632571
...
...
@@ -110,6 +110,10 @@
padding
:
3px
12px
;
margin
:
auto
;
align-items
:
center
;
.icon
{
margin-right
:
$issuable-warning-icon-margin
;
}
}
.disabled-comment
.issuable-note-warning
{
...
...
app/views/projects/_md_preview.html.haml
View file @
03632571
...
...
@@ -2,7 +2,7 @@
-
if
defined?
(
@merge_request
)
&&
@merge_request
.
discussion_locked?
.issuable-note-warning
=
icon
(
'lock'
)
=
icon
(
'lock'
,
class:
'icon'
)
%span
=
_
(
'This merge request is locked.'
)
=
_
(
'Only project members can comment.'
)
...
...
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