Commit a59b7090 authored by gitlabhq's avatar gitlabhq

file code view restyled

parent 6a4f8b99
...@@ -33,7 +33,7 @@ td.linenos{ ...@@ -33,7 +33,7 @@ td.linenos{
} }
td.linenos { td.linenos {
background:#ECECEC; /*background:#F7F7F7;*/
color:#777; color:#777;
padding:10px 0px 0px 10px; padding:10px 0px 0px 10px;
float:left; float:left;
......
...@@ -71,9 +71,17 @@ a { ...@@ -71,9 +71,17 @@ a {
margin-bottom:1em; margin-bottom:1em;
.view_file_header { .view_file_header {
padding:5px 5px; background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
border-bottom:1px solid #CCC; background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
background: #eee; background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
margin: 0;
font-weight: normal;
font-weight: bold;
text-align: left;
color: #666;
border-bottom: 1px solid #DEE2E3;
padding: .9em 1em;
} }
.view_file_content { .view_file_content {
background:#fff; background:#fff;
...@@ -96,6 +104,8 @@ td.code { ...@@ -96,6 +104,8 @@ td.code {
margin-left: 55px; margin-left: 55px;
overflow:auto; overflow:auto;
overflow-y:hidden; overflow-y:hidden;
border-left: 1px solid #DEE2E3;
background: white;
} }
} }
.highlight pre { .highlight pre {
...@@ -103,9 +113,13 @@ td.code { ...@@ -103,9 +113,13 @@ td.code {
word-wrap:normal; word-wrap:normal;
} }
.highlighttable tr:hover { table.highlighttable {
background:white; border: none;
background: #F7F7F7;
} }
body.project-page table.highlighttable td { border: none }
table.highlighttable tr:hover { background:none;}
table.highlighttable pre{ table.highlighttable pre{
line-height:16px !important; line-height:16px !important;
font-size:12px !important; font-size:12px !important;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
= image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;" = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
%span.commit-title %span.commit-title
%strong %strong
= truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120) = truncate(commit.safe_message, :length => 60)
%span.commit-author %span.commit-author
%strong= commit.author_name %strong= commit.author_name
= time_ago_in_words(commit.committed_date) = time_ago_in_words(commit.committed_date)
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
= time_ago_in_words(content_commit.committed_date) = time_ago_in_words(content_commit.committed_date)
ago ago
%td.commit %td.commit
= link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit), :class => "tree-commit-link"
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name) - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm - if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm) = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
= link_to truncate(content_commit.safe_message, :length => tm ? 20 : 40), project_commit_path(@project, content_commit), :class => "tree-commit-link"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment