file code view restyled

4 files changed, 22 insertions, 8 deletions

diff --git a/app/assets/stylesheets/highlight.css.scss b/app/assets/stylesheets/highlight.css.scss
index fc14949a19d..d65865ecdb2 100644
--- a/app/assets/stylesheets/highlight.css.scss
+++ b/app/assets/stylesheets/highlight.css.scss
@@ -33,7 +33,7 @@ td.linenos{
 }
 
 td.linenos {
-  background:#ECECEC;
+  /*background:#F7F7F7;*/
   color:#777;
   padding:10px 0px 0px 10px;
   float:left;
diff --git a/app/assets/stylesheets/projects.css.scss b/app/assets/stylesheets/projects.css.scss
index e0659d77fa9..5d0d4df7ad0 100644
--- a/app/assets/stylesheets/projects.css.scss
+++ b/app/assets/stylesheets/projects.css.scss
@@ -71,9 +71,17 @@ a {
   margin-bottom:1em;
 
   .view_file_header {
-    padding:5px 5px;
-    border-bottom:1px solid #CCC;
-    background: #eee;
+    background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
+    background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
+    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 {
     background:#fff;
@@ -96,6 +104,8 @@ td.code {
     margin-left: 55px;
     overflow:auto;
     overflow-y:hidden;
+    border-left: 1px solid #DEE2E3;
+    background: white;
   }
 }
 .highlight pre {
@@ -103,9 +113,13 @@ td.code {
   word-wrap:normal;
 }
 
-.highlighttable tr:hover {
-  background:white;
+table.highlighttable { 
+  border: none;
+  background: #F7F7F7;
 }
+body.project-page table.highlighttable td { border: none }
+table.highlighttable tr:hover { background:none;}
+
 table.highlighttable pre{
   line-height:16px !important;
   font-size:12px !important;
diff --git a/app/views/commits/_commits.html.haml b/app/views/commits/_commits.html.haml
index e6c0f223d13..4721d1199e3 100644
--- a/app/views/commits/_commits.html.haml
+++ b/app/views/commits/_commits.html.haml
@@ -17,7 +17,7 @@
               = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
             %span.commit-title
               %strong
-                = truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120)
+                = truncate(commit.safe_message, :length => 60)
             %span.commit-author
               %strong= commit.author_name
               = time_ago_in_words(commit.committed_date)
diff --git a/app/views/refs/_tree_item.html.haml b/app/views/refs/_tree_item.html.haml
index 0cc7a4c8314..75e9b906852 100644
--- a/app/views/refs/_tree_item.html.haml
+++ b/app/views/refs/_tree_item.html.haml
@@ -12,7 +12,7 @@
     = time_ago_in_words(content_commit.committed_date)
     ago
   %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)
     - if 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"