Commit 065637a8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ui-improvements' into 'master'

Small UI improvements to make project sidebar more neat

* make sidebar blocks more compact
* make clone panel smaller for better aspect ratio
* make `forked from` section cleaner

Screenshot:

![Screenshot_2015-05-06_16.42.12](https://gitlab.com/gitlab-org/gitlab-ce/uploads/69723db619ae7ae4d9551f6340d45384/Screenshot_2015-05-06_16.42.12.png)

cc @rspeicher

See merge request !617
parents 3f228230 fb00ed99
...@@ -201,9 +201,12 @@ ul.nav.nav-projects-tabs { ...@@ -201,9 +201,12 @@ ul.nav.nav-projects-tabs {
} }
.well { .well {
padding: 14px;
h4 { h4 {
font-weight: normal; font-weight: normal;
margin: 0; margin: 0;
color: #555;
} }
.nav-pills a { .nav-pills a {
......
...@@ -51,10 +51,10 @@ ...@@ -51,10 +51,10 @@
- if @project.forked_from_project - if @project.forked_from_project
.well .well
%i.fa.fa-code-fork.project-fork-icon %h4
Forked from: Forked from
%br .pull-right
= link_to @project.forked_from_project.name_with_namespace, project_path(@project.forked_from_project) = link_to @project.forked_from_project.namespace.try(:name), project_path(@project.forked_from_project)
- if version = @repository.version - if version = @repository.version
......
...@@ -26,8 +26,9 @@ ...@@ -26,8 +26,9 @@
- if readme = @repository.readme - if readme = @repository.readme
.tab-pane#tab-readme .tab-pane#tab-readme
%article.readme-holder#README %article.readme-holder#README
= link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do .clearfix
%h4.readme-file-title %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 %i.fa.fa-file
= readme.name = readme.name
.wiki .wiki
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
.input-group-btn .input-group-btn
%button{ | %button{ |
:type => '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-clone" => project.ssh_url_to_repo, |
:"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH", :"data-title" => "Add an SSH key to your profile<br> to pull or push via SSH",
:"data-html" => "true", :"data-html" => "true",
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
SSH SSH
%button{ | %button{ |
:type => '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-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-title" => "Set a password on your account<br> to pull or push via #{gitlab_config.protocol.upcase}",
:"data-html" => "true", :"data-html" => "true",
:"data-container" => "body"} :"data-container" => "body"}
= gitlab_config.protocol.upcase = 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) - if project.kind_of?(Project)
.input-group-addon .input-group-addon
.visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} project" } .visibility-level-label.has_tooltip{'data-title' => "#{visibility_level_label(project.visibility_level)} project" }
......
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