Commit be79c9de authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

CSS improvements for diff & file view

parent a27ee184
......@@ -32,7 +32,7 @@ gem "httparty"
gem "charlock_holmes"
gem "foreman"
gem "omniauth-ldap"
gem 'bootstrap-sass', "2.0.2"
gem 'bootstrap-sass', "2.0.3"
gem "colored"
gem 'yaml_db', :git => "https://github.com/gitlabhq/yaml_db.git"
gem 'modularity'
......
......@@ -81,7 +81,7 @@ GEM
awesome_print (1.0.2)
bcrypt-ruby (3.0.1)
blankslate (2.1.2.4)
bootstrap-sass (2.0.2)
bootstrap-sass (2.0.3)
builder (3.0.0)
capybara (1.1.2)
mime-types (>= 1.16)
......@@ -321,7 +321,7 @@ DEPENDENCIES
autotest
autotest-rails
awesome_print
bootstrap-sass (= 2.0.2)
bootstrap-sass (= 2.0.3)
capybara
carrierwave
charlock_holmes
......
......@@ -458,9 +458,17 @@ input.git_clone_url {
margin-bottom:1em;
.diff_file_header {
padding:5px 5px;
padding:7px 5px;
border-bottom:1px solid #CCC;
background: #eee;
background-image: -webkit-gradient(linear, 0 0, 0 30, color-stop(0.066, #eee), to(#dfdfdf));
background-image: -webkit-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
span {
font-size:14px;
}
}
.diff_file_content {
overflow:auto;
......@@ -495,8 +503,8 @@ input.git_clone_url {
margin:0px;
padding:0px;
border:none;
background:#F7F7F7;
color:#aaa;
background:#EEE;
color:#666;
padding: 0px 5px;
border-right: 1px solid #ccc;
text-align:right;
......@@ -510,7 +518,7 @@ input.git_clone_url {
float:left;
width:35px;
font-weight:normal;
color:#aaa;
color:#666;
&:hover {
text-decoration:underline;
}
......
.black .highlighttable {
background: #333;
td.linenos { border:none; }
pre { color: #eee }
.highlight { background: #333; border-left:1px solid #555; }
......
......@@ -11,7 +11,7 @@ table.highlighttable
padding:0px;
font-size:12px;
table-layout:fixed;
background: #F7F7F7;
background: #EEE;
}
td.code,
......@@ -44,7 +44,7 @@ td.linenos{
td.linenos {
/*background:#F7F7F7;*/
color:#777;
color:#666;
padding:10px 0px 0px 10px;
float:left;
width:45px;
......
......@@ -8,6 +8,11 @@
@extend .right;
.projects_box {
h5 {
color:$style_color;
font-size:16px;
text-shadow: 0 1px 1px #fff;
}
@extend .leftbar;
@extend .ui-box;
}
......
......@@ -53,14 +53,14 @@
padding: 9px 10px;
height:18px;
.mode_text,
.file_icon {
color:#777;
}
.file_name {
color:#474D57;
color:$style_color;
font-size:14px;
text-shadow: 0 1px 1px #fff;
small {
color:#999;
font-size:13px;
}
}
}
......@@ -110,7 +110,7 @@
table.highlighttable .linenodiv pre {
text-align: right;
padding-right: 4px;
color:#888;
color:#666;
}
#tree-slider {
......
......@@ -23,10 +23,12 @@
.diff_file
.diff_file_header
- if diff.deleted_file
%strong{:id => "#{diff.old_path}"}= diff.old_path
%i.icon-file
%span{:id => "#{diff.old_path}"}= diff.old_path
- else
= link_to tree_file_project_ref_path(@project, @commit.id, diff.new_path) do
%strong{:id => "#{diff.new_path}"}= diff.new_path
%i.icon-file
%span{:id => "#{diff.new_path}"}= diff.new_path
%br/
.diff_file_content
- if file.text?
......
......@@ -6,5 +6,6 @@
= link_to dashboard_merge_requests_path, :class => "#{"current" if current_page?(dashboard_merge_requests_path)}", :id => "merge_requests_slide" do
Requests
%span.count= current_user.cared_merge_requests.count
= link_to "Search", search_path, :class => "#{"current" if current_page?(search_path)}"
= link_to search_path, :class => "#{"current" if current_page?(search_path)}" do
Search
= link_to "Help", help_path, :class => "#{"current" if controller.controller_name == "help"}"
......@@ -2,7 +2,8 @@
= link_to @project.code, project_path(@project), :class => "home #{project_tab_class}", :title => "Project"
- if @project.repo_exists?
- if can? current_user, :download_code, @project
= link_to "Files", tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class
= link_to tree_project_ref_path(@project, @project.root_ref), :class => tree_tab_class do
Files
= link_to "Commits", project_commits_path(@project), :class => commit_tab_class
= link_to "Network", graph_project_path(@project), :class => current_page?(:controller => "projects", :action => "graph", :id => @project) ? "current" : nil
......
:css
.view_file
.view_file_header
.row
.span1.file_icon= image_tag(file.image? ? "file_img.png" : "file_txt.png")
.span2.mode_text= file.mode
.span5.file_name= name
.span3.right
%i.icon-file
%span.file_name
= name
%small #{file.mode}
%span.right
= link_to "raw", blob_project_ref_path(@project, @ref, :path => params[:path]), :class => "right", :target => "_blank"
= link_to "history", project_commits_path(@project, :path => params[:path], :ref => @ref), :class => "right", :style => "margin-right:10px;"
- if file.text?
......
......@@ -11,6 +11,7 @@
#tree-content-holder
.view_file
.view_file_header
%i.icon-file
%strong= @snippet.file_name
.view_file_content
%div{:class => current_user.dark_scheme ? "black" : ""}
......
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