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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
38e32780
Commit
38e32780
authored
Mar 30, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hides current user icon on mobile
parent
3c2b0e75
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+6
-0
app/views/projects/notes/_notes_with_form.html.haml
app/views/projects/notes/_notes_with_form.html.haml
+2
-2
No files found.
app/assets/stylesheets/pages/notes.scss
View file @
38e32780
...
@@ -20,6 +20,12 @@ ul.notes {
...
@@ -20,6 +20,12 @@ ul.notes {
.timeline-content
{
.timeline-content
{
margin-left
:
55px
;
margin-left
:
55px
;
&
.timeline-content-form
{
@media
(
max-width
:
$screen-sm-max
)
{
margin-left
:
0
;
}
}
}
}
.note-created-ago
,
.note-updated-at
{
.note-created-ago
,
.note-updated-at
{
...
...
app/views/projects/notes/_notes_with_form.html.haml
View file @
38e32780
%ul
#notes-list
.notes.main-notes-list.timeline
%ul
#notes-list
.notes.main-notes-list.timeline
=
render
"projects/notes/notes"
=
render
"projects/notes/notes"
%li
.timeline-entry
%li
.timeline-entry
.timeline-icon
.timeline-icon
.hidden-xs.hidden-sm
-
if
can?
current_user
,
:create_note
,
@project
-
if
can?
current_user
,
:create_note
,
@project
%a
.author_link
{
href:
user_path
(
current_user
)
}
%a
.author_link
{
href:
user_path
(
current_user
)
}
=
image_tag
avatar_icon
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
=
image_tag
avatar_icon
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
.timeline-content
.timeline-content
.timeline-content-form
.js-main-target-form
.js-main-target-form
-
if
can?
current_user
,
:create_note
,
@project
-
if
can?
current_user
,
:create_note
,
@project
=
render
"projects/notes/form"
,
view:
diff_view
=
render
"projects/notes/form"
,
view:
diff_view
...
...
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