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
1afd93ee
Commit
1afd93ee
authored
Jan 28, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bootstrap: cleaning commits css
parent
29b5aa2c
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
62 deletions
+17
-62
app/assets/stylesheets/commits.css.scss
app/assets/stylesheets/commits.css.scss
+0
-43
app/assets/stylesheets/projects.css.scss
app/assets/stylesheets/projects.css.scss
+7
-5
app/controllers/commits_controller.rb
app/controllers/commits_controller.rb
+2
-0
app/views/commits/_commits.html.haml
app/views/commits/_commits.html.haml
+8
-14
No files found.
app/assets/stylesheets/commits.css.scss
View file @
1afd93ee
...
@@ -113,46 +113,3 @@ ul.bordered-list li:last-child { border:none }
...
@@ -113,46 +113,3 @@ ul.bordered-list li:last-child { border:none }
tr
.line_notes_row
{
tr
.line_notes_row
{
border-bottom
:
1px
solid
#DDD
;
border-bottom
:
1px
solid
#DDD
;
}
}
/**
*
* COMMIT LIST
*
*/
.commit-info
{
float
:
right
;}
.commit-info
data
{
padding
:
4px
10px
;
font-size
:
11px
;
}
a
.commit
{
padding
:
10px
;
border-bottom
:
1px
solid
#eee
;
overflow
:
hidden
;
display
:
block
;}
a
.commit
:last-child
{
border-bottom
:
0
}
a
.commit
img
{
float
:
left
;
margin-right
:
10px
;}
a
.commit
.commit-title
{
display
:
block
;}
a
.commit
.commit-title
{
margin-bottom
:
10px
}
a
.commit
.commit-author
{
color
:
#999
;
font-weight
:
normal
;
font-style
:
italic
;}
a
.commit
.commit-author
strong
{
font-weight
:
bold
;
font-style
:
normal
;}
.commit-button
{
background-image
:
-webkit-gradient
(
linear
,
0
0
,
0
26
,
color-stop
(
0
.192
,
#fff
)
,
to
(
#f4f4f4
));
background-image
:
-webkit-linear-gradient
(
#fff
19
.2%
,
#f4f4f4
);
background-image
:
-moz-linear-gradient
(
#fff
19
.2%
,
#f4f4f4
);
background-image
:
-o-linear-gradient
(
#fff
19
.2%
,
#f4f4f4
);
box-shadow
:
0
-1px
0
white
inset
;
display
:
block
;
border
:
1px
solid
#eee
;
border-radius
:
5px
;
margin-bottom
:
2px
;
position
:
relative
;
padding-right
:
20px
!
important
;
}
.commit-button
i
{
background
:
url('images.png')
no-repeat
-138px
-27px
;
width
:
6px
;
height
:
9px
;
float
:
right
;
position
:
absolute
;
top
:
6px
;
right
:
5px
;
}
app/assets/stylesheets/projects.css.scss
View file @
1afd93ee
...
@@ -52,18 +52,19 @@
...
@@ -52,18 +52,19 @@
float
:left
;
float
:left
;
margin-right
:
10px
;
margin-right
:
10px
;
}
}
.news-feed
.project-updates
a
.project-update
span
.update-title
,
.dashboard-page
.news-feed
.project-updates
li
a
span
.update-author
{
span
.update-title
,
span
.update-author
{
display
:block
;
display
:block
;
}
}
.news-feed
.project-updates
a
.project-update
span
.update-title
{
span
.update-title
{
margin-bottom
:
10px
margin-bottom
:
10px
}
}
.news-feed
.project-updates
a
.project-update
span
.update-author
{
span
.update-author
{
color
:
#999
;
color
:
#999
;
font-weight
:normal
;
font-weight
:normal
;
font-style
:italic
;
font-style
:italic
;
}
}
.news-feed
.project-updates
a
.project-update
span
.update-author
strong
{
span
.update-author
strong
{
font-weight
:bold
;
font-weight
:bold
;
font-style
:
normal
;
font-style
:
normal
;
}
}
...
@@ -87,7 +88,8 @@ a.update-item img {
...
@@ -87,7 +88,8 @@ a.update-item img {
float
:left
;
float
:left
;
margin-right
:
10px
;
margin-right
:
10px
;
}
}
a
.update-item
span
.update-title
,
.dashboard-page
.news-feed
.project-updates
li
a
span
.update-author
{
span
.update-title
,
span
.update-author
{
display
:block
;
display
:block
;
}
}
a
.update-item
span
.update-title
{
a
.update-item
span
.update-title
{
...
...
app/controllers/commits_controller.rb
View file @
1afd93ee
...
@@ -29,6 +29,8 @@ class CommitsController < ApplicationController
...
@@ -29,6 +29,8 @@ class CommitsController < ApplicationController
@line_notes
=
project
.
commit_line_notes
(
@commit
)
@line_notes
=
project
.
commit_line_notes
(
@commit
)
render_full_content
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
js
{
respond_with_notes
}
format
.
js
{
respond_with_notes
}
...
...
app/views/commits/_commits.html.haml
View file @
1afd93ee
...
@@ -5,21 +5,15 @@
...
@@ -5,21 +5,15 @@
%ul
.unstyled
%ul
.unstyled
-
commits
.
each
do
|
commit
|
-
commits
.
each
do
|
commit
|
%li
%li
%a
{
:class
=>
"commit"
,
:href
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
%a
{
:class
=>
"update-item"
,
:href
=>
project_commit_path
(
@project
,
:id
=>
commit
.
id
)
}
%span
.commit-info
.right.btn
%data
.commit-button
=
truncate
(
commit
.
id
.
to_s
,
:length
=>
10
)
=
truncate
(
commit
.
id
.
to_s
,
:length
=>
16
)
»
%i
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"avatar"
,
:width
=>
32
%data
.commit-browse
{
:onclick
=>
"location.href='#{tree_project_ref_path(@project, commit.id)}';return false;"
}
%div
Browse Code
-
if
commit
.
author_email
=
image_tag
gravatar_icon
(
commit
.
author_email
),
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
-
else
=
image_tag
"no_avatar.png"
,
:class
=>
"left"
,
:width
=>
40
,
:style
=>
"padding-right:5px;"
%span
.commit-title
%strong
%strong
=
truncate
(
commit
.
safe_message
,
:length
=>
7
0
)
=
truncate
(
commit
.
safe_message
,
:length
=>
5
0
)
%span
.
commit
-author
%span
.
update
-author
%strong
=
commit
.
author_name
%strong
=
commit
.
author_name
=
time_ago_in_words
(
commit
.
committed_date
)
=
time_ago_in_words
(
commit
.
committed_date
)
ago
ago
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