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
Boxiang Sun
gitlab-ce
Commits
4bea030c
Commit
4bea030c
authored
Sep 08, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Style system notes
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
def4d8b9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
47 deletions
+16
-47
app/assets/stylesheets/base/gl_variables.scss
app/assets/stylesheets/base/gl_variables.scss
+7
-0
app/assets/stylesheets/generic/timeline.scss
app/assets/stylesheets/generic/timeline.scss
+3
-33
app/assets/stylesheets/pages/notes.scss
app/assets/stylesheets/pages/notes.scss
+4
-5
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+2
-9
No files found.
app/assets/stylesheets/base/gl_variables.scss
View file @
4bea030c
...
@@ -148,3 +148,10 @@ $btn-default-border: #e7e9ed;
...
@@ -148,3 +148,10 @@ $btn-default-border: #e7e9ed;
//
//
//##
//##
$nav-link-padding
:
13px
$gl-padding
;
$nav-link-padding
:
13px
$gl-padding
;
//== Code
//
//##
$pre-bg
:
#f8fafc
!
default
;
$pre-color
:
$gl-gray
!
default
;
$pre-border-color
:
#e7e9ed
;
app/assets/stylesheets/generic/timeline.scss
View file @
4bea030c
...
@@ -28,39 +28,9 @@
...
@@ -28,39 +28,9 @@
}
}
}
}
.system-note
.timeline-entry-inner
{
.system-note
{
.timeline-icon
{
float
:
left
;
margin-left
:
12px
;
margin-top
:
8px
;
@include
box-shadow
(
none
);
span
{
margin
:
0
2px
;
font-size
:
16px
;
color
:
#eeeeee
;
}
}
.timeline-content
{
background
:
none
;
margin-left
:
45px
;
padding
:
0px
15px
;
&
:after
{
border
:
0
;
}
.note-header
{
span
{
font-size
:
12px
;
}
.avatar
{
margin-right
:
5px
;
}
}
.note-text
{
.note-text
{
font-size
:
12px
;
color
:
$gl-gray
!
important
;
margin-left
:
20px
;
}
}
}
}
}
}
}
...
...
app/assets/stylesheets/pages/notes.scss
View file @
4bea030c
...
@@ -34,10 +34,8 @@ ul.notes {
...
@@ -34,10 +34,8 @@ ul.notes {
content
:
"\00b7"
;
content
:
"\00b7"
;
}
}
font-size
:
13px
;
a
{
a
{
@extend
.c
gray
;
color
:
$gl-
gray
;
&
:hover
{
&
:hover
{
text-decoration
:
underline
;
text-decoration
:
underline
;
...
@@ -45,8 +43,9 @@ ul.notes {
...
@@ -45,8 +43,9 @@ ul.notes {
}
}
}
}
.author
{
.author
{
color
:
#333
;
color
:
#4c4e54
;
font-weight
:
bold
;
margin-right
:
3px
;
&
:hover
{
&
:hover
{
color
:
$gl-link-color
;
color
:
$gl-link-color
;
}
}
...
...
app/views/projects/notes/_note.html.haml
View file @
4bea030c
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
[
dom_class
(
note
),
"note-row-#{note.id}"
,
(
'system-note'
if
note
.
system
)],
data:
{
discussion:
note
.
discussion_id
}
}
%li
.timeline-entry
{
id:
dom_id
(
note
),
class:
[
dom_class
(
note
),
"note-row-#{note.id}"
,
(
'system-note'
if
note
.
system
)],
data:
{
discussion:
note
.
discussion_id
}
}
.timeline-entry-inner
.timeline-entry-inner
.timeline-icon
.timeline-icon
-
if
note
.
system
%span
=
icon
(
'circle'
)
-
else
=
link_to
user_path
(
note
.
author
)
do
=
link_to
user_path
(
note
.
author
)
do
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
'avatar s40'
,
alt:
''
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
'avatar s40'
,
alt:
''
.timeline-content
.timeline-content
...
@@ -22,10 +19,6 @@
...
@@ -22,10 +19,6 @@
%span
.note-role.label
%span
.note-role.label
=
member
.
human_access
=
member
.
human_access
-
if
note
.
system
=
link_to
user_path
(
note
.
author
)
do
=
image_tag
avatar_icon
(
note
.
author_email
),
class:
'avatar s16'
,
alt:
''
=
link_to_member
(
note
.
project
,
note
.
author
,
avatar:
false
)
=
link_to_member
(
note
.
project
,
note
.
author
,
avatar:
false
)
%span
.author-username
%span
.author-username
...
...
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