Download as
Browse Code »

Commit be79c9def9c90e9359f67058befae1d7b914e557

Authored by Dmitriy Zaporozhets
1 parent a27ee184
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

CSS improvements for diff & file view

Showing 13 changed files with 46 additions and 29 deletions   Show diff stats
Gemfile
  Diff comments   View file @be79c9d
... ... @@ -32,7 +32,7 @@ gem "httparty"
32 32 gem "charlock_holmes"
33 33 gem "foreman"
34 34 gem "omniauth-ldap"
35   -gem 'bootstrap-sass', "2.0.2"
  35 +gem 'bootstrap-sass', "2.0.3"
36 36 gem "colored"
37 37 gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
38 38 gem 'modularity'
... ...
Gemfile.lock
  Diff comments   View file @be79c9d
... ... @@ -81,7 +81,7 @@ GEM
81 81 awesome_print (1.0.2)
82 82 bcrypt-ruby (3.0.1)
83 83 blankslate (2.1.2.4)
84   - bootstrap-sass (2.0.2)
  84 + bootstrap-sass (2.0.3)
85 85 builder (3.0.0)
86 86 capybara (1.1.2)
87 87 mime-types (>= 1.16)
... ... @@ -321,7 +321,7 @@ DEPENDENCIES
321 321 autotest
322 322 autotest-rails
323 323 awesome_print
324   - bootstrap-sass (= 2.0.2)
  324 + bootstrap-sass (= 2.0.3)
325 325 capybara
326 326 carrierwave
327 327 charlock_holmes
... ...
app/assets/stylesheets/common.scss
  Diff comments   View file @be79c9d
... ... @@ -458,9 +458,17 @@ input.git_clone_url {
458 458 margin-bottom:1em;
459 459  
460 460 .diff_file_header {
461   - padding:5px 5px;
  461 + padding:7px 5px;
462 462 border-bottom:1px solid #CCC;
463 463 background: #eee;
  464 + background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
  465 + background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
  466 + background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
  467 + background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
  468 +
  469 + span {
  470 + font-size:14px;
  471 + }
464 472 }
465 473 .diff_file_content {
466 474 overflow:auto;
... ... @@ -495,8 +503,8 @@ input.git_clone_url {
495 503 margin:0px;
496 504 padding:0px;
497 505 border:none;
498   - background:#F7F7F7;
499   - color:#aaa;
  506 + background:#EEE;
  507 + color:#666;
500 508 padding: 0px 5px;
501 509 border-right: 1px solid #ccc;
502 510 text-align:right;
... ... @@ -510,7 +518,7 @@ input.git_clone_url {
510 518 float:left;
511 519 width:35px;
512 520 font-weight:normal;
513   - color:#aaa;
  521 + color:#666;
514 522 &:hover {
515 523 text-decoration:underline;
516 524 }
... ...
app/assets/stylesheets/highlight.black.scss
  Diff comments   View file @be79c9d
1 1 .black .highlighttable {
2   - background: #333;
3 2 td.linenos { border:none; }
4 3 pre { color: #eee }
5 4 .highlight { background: #333; border-left:1px solid #555; }
... ...
app/assets/stylesheets/highlight.scss
  Diff comments   View file @be79c9d
... ... @@ -11,7 +11,7 @@ table.highlighttable
11 11 padding:0px;
12 12 font-size:12px;
13 13 table-layout:fixed;
14   - background: #F7F7F7;
  14 + background: #EEE;
15 15 }
16 16  
17 17 td.code,
... ... @@ -44,7 +44,7 @@ td.linenos{
44 44  
45 45 td.linenos {
46 46 /*background:#F7F7F7;*/
47   - color:#777;
  47 + color:#666;
48 48 padding:10px 0px 0px 10px;
49 49 float:left;
50 50 width:45px;
... ...
app/assets/stylesheets/sections/projects.scss
  Diff comments   View file @be79c9d
... ... @@ -8,6 +8,11 @@
8 8 @extend .right;
9 9  
10 10 .projects_box {
  11 + h5 {
  12 + color:$style_color;
  13 + font-size:16px;
  14 + text-shadow: 0 1px 1px #fff;
  15 + }
11 16 @extend .leftbar;
12 17 @extend .ui-box;
13 18 }
... ...
app/assets/stylesheets/tree.scss
  Diff comments   View file @be79c9d
... ... @@ -53,14 +53,14 @@
53 53 padding: 9px 10px;
54 54 height:18px;
55 55  
56   - .mode_text,
57   - .file_icon {
58   - color:#777;
59   - }
60   -
61 56 .file_name {
62   - color:#474D57;
  57 + color:$style_color;
  58 + font-size:14px;
63 59 text-shadow: 0 1px 1px #fff;
  60 + small {
  61 + color:#999;
  62 + font-size:13px;
  63 + }
64 64 }
65 65 }
66 66  
... ... @@ -110,7 +110,7 @@
110 110 table.highlighttable .linenodiv pre {
111 111 text-align: right;
112 112 padding-right: 4px;
113   - color:#888;
  113 + color:#666;
114 114 }
115 115  
116 116 #tree-slider {
... ...
app/views/commits/_diffs.html.haml
  Diff comments   View file @be79c9d
... ... @@ -23,10 +23,12 @@
23 23 .diff_file
24 24 .diff_file_header
25 25 - if diff.deleted_file
26   - %strong{:id => "#{diff.old_path}"}= diff.old_path
  26 + %i.icon-file
  27 + %span{:id => "#{diff.old_path}"}= diff.old_path
27 28 - else
28 29 = link_to tree_file_project_ref_path(@project, @commit.id, diff.new_path) do
29   - %strong{:id => "#{diff.new_path}"}= diff.new_path
  30 + %i.icon-file
  31 + %span{:id => "#{diff.new_path}"}= diff.new_path
30 32 %br/
31 33 .diff_file_content
32 34 - if file.text?
... ...
app/views/layouts/_app_menu.html.haml
  Diff comments   View file @be79c9d
... ... @@ -6,5 +6,6 @@
6 6 = link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
7 7 Requests
8 8 %span.count= current_user.cared_merge_requests.count
9   - = link_to "Search", search_path, :class => "#{"current" if current_page?(search_path)}"
  9 + = link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
  10 + Search
10 11 = link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
... ...
app/views/layouts/_project_menu.html.haml
  Diff comments   View file @be79c9d
... ... @@ -2,7 +2,8 @@
2 2 = link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
3 3 - if @project.repo_exists?
4 4 - if can? current_user, :download_code, @project
5   - = link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
  5 + = link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
  6 + Files
6 7 = link_to "Commits", project_commits_path(@project), :class => commit_tab_class
7 8  
8 9 = link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
... ...
app/views/projects/index.html.haml
  Diff comments   View file @be79c9d
... ... @@ -11,7 +11,7 @@
11 11 to your profile
12 12 - if @events.any?
13 13 = render @events
14   - - else
  14 + - else
15 15 .padded
16 16 %strong.cgray Projects activity will be displayed here
17 17 .side
... ...
app/views/refs/_tree_file.html.haml
  Diff comments   View file @be79c9d
1 1 :css
2 2 .view_file
3 3 .view_file_header
4   - .row
5   - .span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
6   - .span2.mode_text= file.mode
7   - .span5.file_name= name
8   - .span3.right
9   - = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
10   - = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
  4 + %i.icon-file
  5 + %span.file_name
  6 + = name
  7 + %small #{file.mode}
  8 + %span.right
  9 + = link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
  10 + = link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
11 11 - if file.text?
12 12 - if name =~ /\.(md|markdown)$/i
13 13 #tree-readme-holder
... ...
app/views/snippets/show.html.haml
  Diff comments   View file @be79c9d
... ... @@ -11,6 +11,7 @@
11 11 #tree-content-holder
12 12 .view_file
13 13 .view_file_header
  14 + %i.icon-file
14 15 %strong= @snippet.file_name
15 16 .view_file_content
16 17 %div{:class => current_user.dark_scheme ? "black" : ""}
... ...