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
Jérome Perrin
gitlab-ce
Commits
906f8efd
Commit
906f8efd
authored
Feb 19, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refactor commits css
parent
ee6c4a2c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
212 additions
and
223 deletions
+212
-223
app/assets/stylesheets/sections/commit.scss
app/assets/stylesheets/sections/commit.scss
+131
-0
app/assets/stylesheets/sections/commits.scss
app/assets/stylesheets/sections/commits.scss
+80
-222
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/commit.scss
0 → 100644
View file @
906f8efd
.commit-title
{
display
:
block
;
}
.commit-title
{
margin-bottom
:
10px
;
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;
}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;
}
.commit-description
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
margin-top
:
10px
;
}
.commit-stat-summary
{
color
:
#666
;
font-size
:
14px
;
font-weight
:
normal
;
padding
:
10px
0
;
}
.commit-info-row
{
margin-bottom
:
10px
;
.avatar
{
@extend
.avatar-inline
;
}
.commit-committer-link
,
.commit-author-link
{
color
:
#444
;
font-weight
:
bold
;
}
}
.commit-committer-link
,
.commit-author-link
{
font-size
:
13px
;
color
:
#555
;
&
:hover
{
color
:
#999
;
}
}
.commit-box
{
margin
:
10px
0
;
border-top
:
1px
solid
#ddd
;
border-bottom
:
1px
solid
#ddd
;
padding
:
20px
0
;
.commit-title
{
margin
:
0
;
}
.commit-description
{
margin-top
:
15px
;
}
}
.file-stats
a
{
color
:
$style_color
;
}
.file-stats
{
.new-file
{
a
{
color
:
#090
;
}
i
{
color
:
#1BCF00
;
}
}
.renamed-file
{
i
{
color
:
#FE9300
;
}
}
.deleted-file
{
a
{
color
:
#B00
;
}
i
{
color
:
#EE0000
;
}
}
.edit-file
{
i
{
color
:
#555
;
}
}
}
/*
* Commit message textarea for web editor and
* custom merge request message
*/
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace_font
;
$left
:
12px
;
.max-width-marker
{
width
:
72ch
;
color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
left
:
$left
;
height
:
100%
;
border-right
:
1px
solid
mix
(
$input-border
,
white
);
position
:
absolute
;
z-index
:
1
;
}
>
textarea
{
background-color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
padding-left
:
$left
;
position
:
relative
;
z-index
:
2
;
}
}
app/assets/stylesheets/sections/commits.scss
View file @
906f8efd
/**
* Commit file
*/
.commit-committer-link
,
.commit-author-link
{
font-size
:
13px
;
color
:
#555
;
&
:hover
{
color
:
#999
;
}
}
/** COMMIT BLOCK **/
.commit-title
{
display
:
block
;
}
.commit-title
{
margin-bottom
:
10px
;
}
.commit-author
,
.commit-committer
{
display
:
block
;
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;
}
.commit-author
strong
,
.commit-committer
strong
{
font-weight
:
bold
;
font-style
:
normal
;
}
.file-stats
a
{
color
:
$style_color
;
}
.file-stats
{
.new-file
{
a
{
color
:
#090
;
}
i
{
color
:
#1BCF00
;
}
}
.renamed-file
{
i
{
color
:
#FE9300
;
}
}
.deleted-file
{
a
{
color
:
#B00
;
}
i
{
color
:
#EE0000
;
}
}
.edit-file
{
i
{
color
:
#555
;
}
}
}
.label_commit
{
@include
border-radius
(
4px
);
padding
:
2px
4px
;
font-size
:
13px
;
background
:
#474D57
;
color
:
#fff
;
font-family
:
$monospace_font
;
}
.commits-compare-switch
{
.commits-compare-switch
{
background
:
image-url
(
"switch_icon.png"
)
no-repeat
center
center
;
background
:
image-url
(
"switch_icon.png"
)
no-repeat
center
center
;
width
:
32px
;
width
:
32px
;
...
@@ -85,64 +11,23 @@
...
@@ -85,64 +11,23 @@
background-color
:
#EEE
;
background-color
:
#EEE
;
}
}
.commit-description
{
background
:
none
;
border
:
none
;
margin
:
0
;
padding
:
0
;
margin-top
:
10px
;
}
.commit-box
{
margin
:
10px
0
;
border-top
:
1px
solid
#ddd
;
border-bottom
:
1px
solid
#ddd
;
padding
:
20px
0
;
.commit-title
{
margin
:
0
;
}
.commit-description
{
margin-top
:
15px
;
}
}
.commit-stat-summary
{
color
:
#666
;
font-size
:
14px
;
font-weight
:
normal
;
padding
:
10px
0
;
}
.commit-info-row
{
margin-bottom
:
10px
;
.avatar
{
@extend
.avatar-inline
;
}
.commit-committer-link
,
.commit-author-link
{
color
:
#444
;
font-weight
:
bold
;
}
}
.lists-separator
{
.lists-separator
{
margin
:
10px
0
;
margin
:
10px
0
;
border-top
:
1px
dashed
#CCC
;
border-top
:
1px
dashed
#CCC
;
}
}
/**
.commits-row
{
* COMMIT ROW
ul
{
*/
margin
:
0
;
ul
li
.commit
{
li
.commit
{
padding
:
8px
0
;
padding
:
8px
0
;
.commit-row-title
{
.commit-row-title
{
font-size
:
$list-font-size
;
font-size
:
$list-font-size
;
line-height
:
20px
;
line-height
:
20px
;
margin-bottom
:
5
px
;
margin-bottom
:
2
px
;
.notes_count
{
.notes_count
{
float
:
right
;
float
:
right
;
...
@@ -196,6 +81,7 @@ ul li.commit {
...
@@ -196,6 +81,7 @@ ul li.commit {
.commit-row-info
{
.commit-row-info
{
color
:
#777
;
color
:
#777
;
line-height
:
24px
;
a
{
a
{
color
:
#777
;
color
:
#777
;
...
@@ -216,42 +102,7 @@ ul li.commit {
...
@@ -216,42 +102,7 @@ ul li.commit {
@extend
.cgray
;
@extend
.cgray
;
}
}
}
}
}
.commits-feed-holder
{
float
:
right
;
.btn
{
padding
:
4px
12px
;
}
}
.commit-message-container
{
background-color
:
$body-bg
;
position
:
relative
;
font-family
:
$monospace_font
;
$left
:
12px
;
.max-width-marker
{
width
:
72ch
;
color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
left
:
$left
;
height
:
100%
;
border-right
:
1px
solid
mix
(
$input-border
,
white
);
position
:
absolute
;
z-index
:
1
;
}
>
textarea
{
background-color
:
rgba
(
0
,
0
,
0
,
0
.0
);
font-family
:
inherit
;
padding-left
:
$left
;
position
:
relative
;
z-index
:
2
;
}
}
}
.commits-row
{
ul
{
margin
:
0
;
}
}
.commits-row-date
{
.commits-row-date
{
...
@@ -260,3 +111,10 @@ ul li.commit {
...
@@ -260,3 +111,10 @@ ul li.commit {
margin-bottom
:
5px
;
margin-bottom
:
5px
;
}
}
}
}
.commits-feed-holder
{
float
:
right
;
.btn
{
padding
:
4px
12px
;
}
}
app/views/projects/commits/_commit.html.haml
View file @
906f8efd
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
=
preserve
(
gfm
(
escape_once
(
commit
.
description
)))
=
preserve
(
gfm
(
escape_once
(
commit
.
description
)))
.commit-row-info
.commit-row-info
=
commit_author_link
(
commit
,
avatar:
true
,
size:
16
)
=
commit_author_link
(
commit
,
avatar:
true
,
size:
24
)
authored
authored
.committed_ago
.committed_ago
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
#{
time_ago_with_tooltip
(
commit
.
committed_date
)
}
...
...
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