From 08fded3fac00b2628e167c21541379784e9d2fa0 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 29 Nov 2012 18:09:27 +0200
Subject: [PATCH] Minor improvments to UI

---
 app/assets/stylesheets/common.scss                  |  4 ++++
 app/assets/stylesheets/gitlab_bootstrap/common.scss | 11 ++++++++++-
 app/views/dashboard/index.html.haml                 |  1 -
 app/views/groups/_projects.html.haml                |  2 ++
 app/views/groups/show.html.haml                     |  1 -
 app/views/layouts/project_resource.html.haml        |  1 +
 app/views/projects/empty.html.haml                  |  1 -
 app/views/shared/_no_ssh.html.haml                  |  2 +-
 8 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 3abc796a..c82ddc18 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -602,6 +602,10 @@ li.note {
   margin-bottom: 10px;
   background: #FEE;
   padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
 }
 
 .oauth_select_holder {
diff --git a/app/assets/stylesheets/gitlab_bootstrap/common.scss b/app/assets/stylesheets/gitlab_bootstrap/common.scss
index ab00995f..d6089cea 100644
--- a/app/assets/stylesheets/gitlab_bootstrap/common.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap/common.scss
@@ -34,6 +34,7 @@
 /** PILLS & TABS**/
 .nav-pills a:hover { background-color: #888; }
 .nav-pills .active a { background-color: $style_color; }
+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
 .nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
 .nav.nav-tabs {
   li {
@@ -77,7 +78,15 @@ img.lil_av { padding-left: 4px; padding-right: 3px; }
 img.small { width: 80px; }
 
 /** HELPERS **/
-.nothing_here_message { text-align: center; padding: 20px; color: #777; }
+.nothing_here_message {
+  text-align: center;
+  padding: 20px;
+  color: #666;
+  font-weight: normal;
+  font-size: 16px;
+  line-height: 36px;
+}
+
 p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
 
 /** FORMS **/
diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index d0882c6d..6b360dc1 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -2,7 +2,6 @@
   .projects
     .activities.span8
       = render "events/event_last_push", event: @last_push
-      = render 'shared/no_ssh'
 
       .event_filter
         = event_filter_link EventFilter.push, 'Push events'
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 6425a2e6..39c0b6af 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -9,6 +9,8 @@
           %i.icon-plus
           New Project
   %ul.unstyled
+    - if projects.blank?
+      %p.nothing_here_message This groups has no projects yet
     - projects.each do |project|
       %li.wll
         = link_to project_path(project), class: dom_class(project) do
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 0c2eb150..b929b267 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -6,7 +6,6 @@
     &nbsp;
     %span.cgray Events and projects are filtered in scope of group
     %hr
-    = render 'shared/no_ssh'
     - if @events.any?
       .content_list= render @events
     - else
diff --git a/app/views/layouts/project_resource.html.haml b/app/views/layouts/project_resource.html.haml
index aa312328..b52ef574 100644
--- a/app/views/layouts/project_resource.html.haml
+++ b/app/views/layouts/project_resource.html.haml
@@ -4,6 +4,7 @@
   %body{class: "#{app_theme} project"}
     = render "layouts/flash"
     = render "layouts/head_panel", title: @project.name
+    = render 'shared/no_ssh'
     .container
       %ul.main_menu
         = nav_link(html_options: {class: "home #{project_tab_class}"}) do
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index d9a151fc..c0b2a8e6 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -1,4 +1,3 @@
-= render 'shared/no_ssh'
 = render 'clone_panel'
 
 %div.git-empty
diff --git a/app/views/shared/_no_ssh.html.haml b/app/views/shared/_no_ssh.html.haml
index 4e643090..5fdcea85 100644
--- a/app/views/shared/_no_ssh.html.haml
+++ b/app/views/shared/_no_ssh.html.haml
@@ -1,3 +1,3 @@
 - if current_user.require_ssh_key?
-  %p.error_message
+  %p.error_message.centered
     You won't be able to pull or push project code via SSH until you #{link_to 'add an SSH key', new_key_path} to your profile