Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
37e3d42b
Commit
37e3d42b
authored
Oct 06, 2017
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
UX review
parent
97f96407
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
2 deletions
+11
-2
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
...javascripts/vue_shared/components/issue/issue_warning.vue
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-0
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+4
-0
app/assets/stylesheets/pages/note_form.scss
app/assets/stylesheets/pages/note_form.scss
+4
-0
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
No files found.
app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
View file @
37e3d42b
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<div
class=
"issuable-note-warning"
>
<div
class=
"issuable-note-warning"
>
<i
<i
aria-hidden=
"true"
aria-hidden=
"true"
class=
"fa"
class=
"fa
icon
"
:class=
"iconClass"
:class=
"iconClass"
v-if=
"!isLockedAndConfidential"
v-if=
"!isLockedAndConfidential"
></i>
></i>
...
...
app/assets/stylesheets/framework/variables.scss
View file @
37e3d42b
...
@@ -703,3 +703,4 @@ $java: #70ad51;
...
@@ -703,3 +703,4 @@ $java: #70ad51;
Issuable warning
Issuable warning
*/
*/
$issuable-warning-size
:
24px
;
$issuable-warning-size
:
24px
;
$issuable-warning-icon-margin
:
4px
;
app/assets/stylesheets/pages/issuable.scss
View file @
37e3d42b
...
@@ -14,6 +14,10 @@
...
@@ -14,6 +14,10 @@
width
:
$issuable-warning-size
;
width
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
height
:
$issuable-warning-size
;
text-align
:
center
;
text-align
:
center
;
&
:first-of-type
{
margin-right
:
$issuable-warning-icon-margin
;
}
}
}
.sidebar-item-icon
{
.sidebar-item-icon
{
...
...
app/assets/stylesheets/pages/note_form.scss
View file @
37e3d42b
...
@@ -110,6 +110,10 @@
...
@@ -110,6 +110,10 @@
padding
:
3px
12px
;
padding
:
3px
12px
;
margin
:
auto
;
margin
:
auto
;
align-items
:
center
;
align-items
:
center
;
.icon
{
margin-right
:
$issuable-warning-icon-margin
;
}
}
}
.disabled-comment
.issuable-note-warning
{
.disabled-comment
.issuable-note-warning
{
...
...
app/views/projects/_md_preview.html.haml
View file @
37e3d42b
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
if
defined?
(
@merge_request
)
&&
@merge_request
.
discussion_locked?
-
if
defined?
(
@merge_request
)
&&
@merge_request
.
discussion_locked?
.issuable-note-warning
.issuable-note-warning
=
icon
(
'lock'
)
=
icon
(
'lock'
,
class:
'icon'
)
%span
%span
=
_
(
'This merge request is locked.'
)
=
_
(
'This merge request is locked.'
)
=
_
(
'Only project members can comment.'
)
=
_
(
'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