Commit d0d596ae authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'project-aside' into 'master'

Use panels instead of well for widgets in project sidebar

Cleaner look and less distractive

![Screenshot_2015-05-28_17.31.27](https://gitlab.com/gitlab-org/gitlab-ce/uploads/d4f8e58f76c7f62c488dd571c313e21e/Screenshot_2015-05-28_17.31.27.png)

See merge request !732
parents ce5928f4 a01737ac
...@@ -209,13 +209,9 @@ ul.nav.nav-projects-tabs { ...@@ -209,13 +209,9 @@ ul.nav.nav-projects-tabs {
line-height: 1.5; line-height: 1.5;
} }
.well { .panel {
padding: 14px; .panel-heading, .panel-footer {
background-color: #fcfcfc;
h4 {
font-weight: normal;
margin: 0;
color: #555;
} }
.actions { .actions {
...@@ -224,10 +220,12 @@ ul.nav.nav-projects-tabs { ...@@ -224,10 +220,12 @@ ul.nav.nav-projects-tabs {
.nav-pills a { .nav-pills a {
padding: 10px; padding: 10px;
font-weight: bold;
color: $gl-link-color;
} }
.nav { .nav {
margin: 10px 0; margin-bottom: 10px;
} }
} }
......
.clearfix .clearfix
- unless @project.empty_repo? - unless @project.empty_repo?
.well .panel.panel-default
%h4.visibility-level-label .panel-heading
= visibility_level_icon(@project.visibility_level) = visibility_level_icon(@project.visibility_level)
= "#{visibility_level_label(@project.visibility_level).capitalize} project" = "#{visibility_level_label(@project.visibility_level).capitalize} project"
.panel-body
- if @repository.changelog || @repository.license || @repository.contribution_guide - if @repository.changelog || @repository.license || @repository.contribution_guide
%ul.nav.nav-pills %ul.nav.nav-pills
- if @repository.changelog - if @repository.changelog
...@@ -32,26 +33,16 @@ ...@@ -32,26 +33,16 @@
New Merge Request New Merge Request
- if forked_from_project = @project.forked_from_project - if forked_from_project = @project.forked_from_project
.well .panel-footer
%h4
= icon("code-fork fw") = icon("code-fork fw")
Forked from Forked from
.pull-right .pull-right
= link_to forked_from_project.namespace.try(:name), project_path(forked_from_project) = link_to forked_from_project.namespace.try(:name), project_path(forked_from_project)
- if version = @repository.version
.well
%h4
= icon("clock-o fw")
Version
.pull-right
= link_to version_url(@project) do
= @repository.blob_by_oid(version.id).data
- @project.ci_services.each do |ci_service| - @project.ci_services.each do |ci_service|
- if ci_service.active? && ci_service.respond_to?(:builds_path) - if ci_service.active? && ci_service.respond_to?(:builds_path)
.well .panel-footer
%h4
= icon("check fw") = icon("check fw")
= ci_service.title = ci_service.title
.pull-right .pull-right
...@@ -61,12 +52,13 @@ ...@@ -61,12 +52,13 @@
- else - else
= link_to 'view builds', ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink' = link_to 'view builds', ci_service.builds_path, :'data-no-turbolink' => 'data-no-turbolink'
- unless @project.empty_repo? - unless @project.empty_repo?
.well .panel.panel-default
%h4 .panel-heading
= icon("archive fw") = icon("archive fw")
Repository Repository
.panel-body
%ul.nav.nav-pills %ul.nav.nav-pills
%li %li
= link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do = link_to namespace_project_commits_path(@project.namespace, @project, @ref || @repository.root_ref) do
...@@ -85,10 +77,18 @@ ...@@ -85,10 +77,18 @@
- if can?(current_user, :download_code, @project) - if can?(current_user, :download_code, @project)
= render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm' = render 'projects/repositories/download_archive', split_button: true, btn_class: 'btn-group-sm'
- if version = @repository.version
.panel-footer
= icon("clock-o fw")
Version
.pull-right
= link_to version_url(@project) do
= @repository.blob_by_oid(version.id).data
= render "shared/clone_panel" = render "shared/clone_panel"
- if @project.archived? - if @project.archived?
%br
.alert.alert-warning .alert.alert-warning
%h4 %h4
= icon("exclamation-triangle fw") = icon("exclamation-triangle fw")
......
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