Download as
Browse Code »

Commit a59b70902143f8f734c00baaa2fb006c073b91d7

Authored by gitlabhq
1 parent 6a4f8b99
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

file code view restyled

Showing 4 changed files with 22 additions and 8 deletions   Show diff stats
app/assets/stylesheets/highlight.css.scss
  Diff comments   View file @a59b709
... ... @@ -33,7 +33,7 @@ td.linenos{
33 33 }
34 34  
35 35 td.linenos {
36   - background:#ECECEC;
  36 + /*background:#F7F7F7;*/
37 37 color:#777;
38 38 padding:10px 0px 0px 10px;
39 39 float:left;
... ...
app/assets/stylesheets/projects.css.scss
  Diff comments   View file @a59b709
... ... @@ -71,9 +71,17 @@ a {
71 71 margin-bottom:1em;
72 72  
73 73 .view_file_header {
74   - padding:5px 5px;
75   - border-bottom:1px solid #CCC;
76   - background: #eee;
  74 + background-image: -webkit-gradient(linear, 0 0, 0 26, color-stop(0.076, #fefefe), to(#F6F7F8));
  75 + background-image: -webkit-linear-gradient(#fefefe 7.6%, #F6F7F8);
  76 + background-image: -moz-linear-gradient(#fefefe 7.6%, #F6F7F8);
  77 + background-image: -o-linear-gradient(#fefefe 7.6%, #F6F7F8);
  78 + margin: 0;
  79 + font-weight: normal;
  80 + font-weight: bold;
  81 + text-align: left;
  82 + color: #666;
  83 + border-bottom: 1px solid #DEE2E3;
  84 + padding: .9em 1em;
77 85 }
78 86 .view_file_content {
79 87 background:#fff;
... ... @@ -96,6 +104,8 @@ td.code {
96 104 margin-left: 55px;
97 105 overflow:auto;
98 106 overflow-y:hidden;
  107 + border-left: 1px solid #DEE2E3;
  108 + background: white;
99 109 }
100 110 }
101 111 .highlight pre {
... ... @@ -103,9 +113,13 @@ td.code {
103 113 word-wrap:normal;
104 114 }
105 115  
106   -.highlighttable tr:hover {
107   - background:white;
  116 +table.highlighttable {
  117 + border: none;
  118 + background: #F7F7F7;
108 119 }
  120 +body.project-page table.highlighttable td { border: none }
  121 +table.highlighttable tr:hover { background:none;}
  122 +
109 123 table.highlighttable pre{
110 124 line-height:16px !important;
111 125 font-size:12px !important;
... ...
app/views/commits/_commits.html.haml
  Diff comments   View file @a59b709
... ... @@ -17,7 +17,7 @@
17 17 = image_tag "no_avatar.png", :class => "left", :width => 40, :style => "padding-right:5px;"
18 18 %span.commit-title
19 19 %strong
20   - = truncate(commit.safe_message, :length => fixed_mode? ? 60 : 120)
  20 + = truncate(commit.safe_message, :length => 60)
21 21 %span.commit-author
22 22 %strong= commit.author_name
23 23 = time_ago_in_words(commit.committed_date)
... ...
app/views/refs/_tree_item.html.haml
  Diff comments   View file @a59b709
... ... @@ -12,7 +12,7 @@
12 12 = time_ago_in_words(content_commit.committed_date)
13 13 ago
14 14 %td.commit
15   - = link_to truncate(content_commit.safe_message, :length => 40), project_commit_path(@project, content_commit), :class => "tree-commit-link"
16 15 - tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
17 16 - if tm
18 17 = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
  18 + = link_to truncate(content_commit.safe_message, :length => tm ? 20 : 40), project_commit_path(@project, content_commit), :class => "tree-commit-link"
... ...