Minor improvments to UI

Dmitriy Zaporozhets
1 parent 9df6f7bf
Showing 8 changed files with 18 additions and 5 deletions Show diff stats
app/assets/stylesheets/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/views/dashboard/index.html.haml
app/views/groups/_projects.html.haml
app/views/groups/show.html.haml
app/views/layouts/project_resource.html.haml
app/views/projects/empty.html.haml
app/views/shared/_no_ssh.html.haml
@@ -602,6 +602,10 @@ li.note {
   margin-bottom: 10px;
   background: #FEE;
   padding-left: 20px;
+
+  &.centered {
+    text-align: center;
+  }
 }
  
 .oauth_select_holder {
@@ -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 **/
@@ -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'
@@ -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
@@ -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
@@ -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
-= render 'shared/no_ssh'
 = render 'clone_panel'
  
 %div.git-empty
 - 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
...	...	@@ -602,6 +602,10 @@ li.note {
602	602	margin-bottom: 10px;
603	603	background: #FEE;
604	604	padding-left: 20px;
	605	+
	606	+ &.centered {
	607	+ text-align: center;
	608	+ }
605	609	}
606	610
607	611	.oauth_select_holder {
...	...
...	...	@@ -34,6 +34,7 @@
34	34	/ PILLS & TABS/
35	35	.nav-pills a:hover { background-color: #888; }
36	36	.nav-pills .active a { background-color: $style_color; }
	37	+.nav-pills > .active > a > i[class^="icon-"] { background: inherit; }
37	38	.nav-tabs > li > a, .nav-pills > li > a { color: $style_color; }
38	39	.nav.nav-tabs {
39	40	li {
...	...	@@ -77,7 +78,15 @@ img.lil_av { padding-left: 4px; padding-right: 3px; }
77	78	img.small { width: 80px; }
78	79
79	80	/ HELPERS /
80		-.nothing_here_message { text-align: center; padding: 20px; color: #777; }
	81	+.nothing_here_message {
	82	+ text-align: center;
	83	+ padding: 20px;
	84	+ color: #666;
	85	+ font-weight: normal;
	86	+ font-size: 16px;
	87	+ line-height: 36px;
	88	+}
	89	+
81	90	p.slead { color: #456; font-size: 16px; margin-bottom: 12px; font-weight: 200; line-height: 24px; }
82	91
83	92	/ FORMS /
...	...
...	...	@@ -2,7 +2,6 @@
2	2	.projects
3	3	.activities.span8
4	4	= render "events/event_last_push", event: @last_push
5		- = render 'shared/no_ssh'
6	5
7	6	.event_filter
8	7	= event_filter_link EventFilter.push, 'Push events'
...	...
...	...	@@ -9,6 +9,8 @@
9	9	%i.icon-plus
10	10	New Project
11	11	%ul.unstyled
	12	+ - if projects.blank?
	13	+ %p.nothing_here_message This groups has no projects yet
12	14	- projects.each do \|project\|
13	15	%li.wll
14	16	= link_to project_path(project), class: dom_class(project) do
...	...
...	...	@@ -6,7 +6,6 @@
6	6
7	7	%span.cgray Events and projects are filtered in scope of group
8	8	%hr
9		- = render 'shared/no_ssh'
10	9	- if @events.any?
11	10	.content_list= render @events
12	11	- else
...	...
...	...	@@ -4,6 +4,7 @@
4	4	%body{class: "#{app_theme} project"}
5	5	= render "layouts/flash"
6	6	= render "layouts/head_panel", title: @project.name
	7	+ = render 'shared/no_ssh'
7	8	.container
8	9	%ul.main_menu
9	10	= nav_link(html_options: {class: "home #{project_tab_class}"}) do
...	...
1		-= render 'shared/no_ssh'
2	1	= render 'clone_panel'
3	2
4	3	%div.git-empty
...	...
1	1	- if current_user.require_ssh_key?
2		- %p.error_message
	2	+ %p.error_message.centered
3	3	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
...	...