diff --git a/Gemfile b/Gemfile index 5d3e59ef..1cb5520a 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/Gemfile.lock b/Gemfile.lock index 90280cbe..182cf669 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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 diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index 219f4988..c7112de3 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -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; } diff --git a/app/assets/stylesheets/highlight.black.scss b/app/assets/stylesheets/highlight.black.scss index e63e08c8..88052c40 100644 --- a/app/assets/stylesheets/highlight.black.scss +++ b/app/assets/stylesheets/highlight.black.scss @@ -1,5 +1,4 @@ .black .highlighttable { - background: #333; td.linenos { border:none; } pre { color: #eee } .highlight { background: #333; border-left:1px solid #555; } diff --git a/app/assets/stylesheets/highlight.scss b/app/assets/stylesheets/highlight.scss index 4010edf9..535ec382 100644 --- a/app/assets/stylesheets/highlight.scss +++ b/app/assets/stylesheets/highlight.scss @@ -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; diff --git a/app/assets/stylesheets/sections/projects.scss b/app/assets/stylesheets/sections/projects.scss index b96f7de9..8c79e45e 100644 --- a/app/assets/stylesheets/sections/projects.scss +++ b/app/assets/stylesheets/sections/projects.scss @@ -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; } diff --git a/app/assets/stylesheets/tree.scss b/app/assets/stylesheets/tree.scss index 8bdcf0d1..a5a7f8bc 100644 --- a/app/assets/stylesheets/tree.scss +++ b/app/assets/stylesheets/tree.scss @@ -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 { diff --git a/app/views/commits/_diffs.html.haml b/app/views/commits/_diffs.html.haml index 63baaad5..e4faa762 100644 --- a/app/views/commits/_diffs.html.haml +++ b/app/views/commits/_diffs.html.haml @@ -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? diff --git a/app/views/layouts/_app_menu.html.haml b/app/views/layouts/_app_menu.html.haml index b8874ab3..8b856a0c 100644 --- a/app/views/layouts/_app_menu.html.haml +++ b/app/views/layouts/_app_menu.html.haml @@ -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"}" diff --git a/app/views/layouts/_project_menu.html.haml b/app/views/layouts/_project_menu.html.haml index 953a979d..00da49ac 100644 --- a/app/views/layouts/_project_menu.html.haml +++ b/app/views/layouts/_project_menu.html.haml @@ -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 diff --git a/app/views/projects/index.html.haml b/app/views/projects/index.html.haml index 46e61709..3578b71c 100644 --- a/app/views/projects/index.html.haml +++ b/app/views/projects/index.html.haml @@ -11,7 +11,7 @@ to your profile - if @events.any? = render @events - - else + - else .padded %strong.cgray Projects activity will be displayed here .side diff --git a/app/views/refs/_tree_file.html.haml b/app/views/refs/_tree_file.html.haml index 93985843..c0a11e72 100644 --- a/app/views/refs/_tree_file.html.haml +++ b/app/views/refs/_tree_file.html.haml @@ -1,13 +1,13 @@ :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 - = 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;" + %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? - if name =~ /\.(md|markdown)$/i #tree-readme-holder diff --git a/app/views/snippets/show.html.haml b/app/views/snippets/show.html.haml index 7af4d249..2720e495 100644 --- a/app/views/snippets/show.html.haml +++ b/app/views/snippets/show.html.haml @@ -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" : ""}