diff options
author | Sytse Sijbrandij <sytse@gitlab.com> | 2015-05-06 17:48:05 +0300 |
---|---|---|
committer | Sytse Sijbrandij <sytse@gitlab.com> | 2015-05-06 17:48:05 +0300 |
commit | dd37aa06ca5d82683e3517d490ac5eca3138ef47 (patch) | |
tree | 990c8382cd5dac358a06ac2ee4afab221117f284 | |
parent | 48f22a39e7275551c35cc84d11caf5df1a581e0e (diff) | |
parent | 065637a80e0701f13e14e18d6e10d1f16a693ac5 (diff) |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
-rw-r--r-- | app/assets/stylesheets/pages/projects.scss | 3 | ||||
-rw-r--r-- | app/views/projects/_aside.html.haml | 8 | ||||
-rw-r--r-- | app/views/projects/_section.html.haml | 9 | ||||
-rw-r--r-- | app/views/shared/_clone_panel.html.haml | 6 |
4 files changed, 15 insertions, 11 deletions
diff --git a/app/assets/stylesheets/pages/projects.scss b/app/assets/stylesheets/pages/projects.scss index afa8aa24ee4..e6a4bc62c58 100644 --- a/app/assets/stylesheets/pages/projects.scss +++ b/app/assets/stylesheets/pages/projects.scss @@ -201,9 +201,12 @@ ul.nav.nav-projects-tabs { } .well { + padding: 14px; + h4 { font-weight: normal; margin: 0; + color: #555; } .nav-pills a { diff --git a/app/views/projects/_aside.html.haml b/app/views/projects/_aside.html.haml index 1a7ab74c93a..b3ae2569499 100644 --- a/app/views/projects/_aside.html.haml +++ b/app/views/projects/_aside.html.haml @@ -51,10 +51,10 @@ - if @project.forked_from_project .well - %i.fa.fa-code-fork.project-fork-icon - Forked from: - %br - = link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) + %h4 + Forked from + .pull-right + = link_to @project.forked_from_project.namespace.try(:name), project_path(@project.forked_from_project) - if version = @repository.version diff --git a/app/views/projects/_section.html.haml b/app/views/projects/_section.html.haml index e6b04c5a34d..0b7f4cb780a 100644 --- a/app/views/projects/_section.html.haml +++ b/app/views/projects/_section.html.haml @@ -26,9 +26,10 @@ - if readme = @repository.readme .tab-pane#tab-readme %article.readme-holder#README - = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do - %h4.readme-file-title - %i.fa.fa-file - = readme.name + .clearfix + %small.pull-right + = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)), class: 'light' do + %i.fa.fa-file + = readme.name .wiki = render_readme(readme) diff --git a/app/views/shared/_clone_panel.html.haml b/app/views/shared/_clone_panel.html.haml index 96357cac592..aaab0d35f59 100644 --- a/app/views/shared/_clone_panel.html.haml +++ b/app/views/shared/_clone_panel.html.haml @@ -3,7 +3,7 @@ .input-group-btn %button{ | :type => 'button', | - class: "btn #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", | + class: "btn btn-sm #{ 'active' if default_clone_protocol == 'ssh' }#{ ' has_tooltip' if current_user && current_user.require_ssh_key? }", | :"data-clone" => project.ssh_url_to_repo, | :"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH", :"data-html" => "true", @@ -11,13 +11,13 @@ SSH %button{ | :type => 'button', | - class: "btn #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", | + class: "btn btn-sm #{ 'active' if default_clone_protocol == 'http' }#{ ' has_tooltip' if current_user && current_user.require_password? }", | :"data-clone" => project.http_url_to_repo, | :"data-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}", :"data-html" => "true", :"data-container" => "body"} = gitlab_config.protocol.upcase - = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control", readonly: true + = text_field_tag :project_clone, default_url_to_repo(project), class: "js-select-on-focus form-control input-sm", readonly: true - if project.kind_of?(Project) .input-group-addon .visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} project" } |