Commit c1fbc2fa authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'ux-improvements' into 'master'

UX improvements

* new project button is green
* show no-ssh error message
* fix avatar align

See merge request !1431
parents 630ff574 1b1277af
...@@ -8,10 +8,11 @@ ...@@ -8,10 +8,11 @@
&.avatar-inline { &.avatar-inline {
float: none; float: none;
margin-left: 3px; margin-left: 4px;
margin-bottom: 2px;
&.s16 { margin-right: 2px; } &.s16 { margin-right: 4px; }
&.s24 { margin-right: 2px; } &.s24 { margin-right: 4px; }
} }
&.s16 { width: 16px; height: 16px; margin-right: 6px; } &.s16 { width: 16px; height: 16px; margin-right: 6px; }
......
...@@ -97,3 +97,12 @@ ...@@ -97,3 +97,12 @@
margin-right: 3px; margin-right: 3px;
width: 16px; width: 16px;
} }
.dash-new-project {
background: $bg_success;
border: 1px solid $border_success;
a {
color: #FFF;
}
}
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
.input-group .input-group
= search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control'
- if current_user.can_create_project? - if current_user.can_create_project?
.input-group-addon .input-group-addon.dash-new-project
= link_to new_project_path, class: "" do = link_to new_project_path do
%strong New project %strong New project
%ul.well-list.dash-list %ul.well-list.dash-list
......
- if current_user && can?(current_user, :download_code, @project)
= render 'shared/no_ssh'
= render "home_panel" = render "home_panel"
%div.git-empty %div.git-empty
......
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