diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 06:58:20 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-19 07:05:39 +0300 |
| commit | ba39ca9f4ad2f5723795a59004fd7b77a51cca43 (patch) | |
| tree | 7b5d667004456fb0440b1dcfffe46259ecd64589 | |
| parent | e7e329d36402ff84f4ba08184283853518136d7f (diff) | |
Fix project name overflow on dashboard
| -rw-r--r-- | app/assets/stylesheets/pages/dashboard.scss | 17 | ||||
| -rw-r--r-- | app/views/dashboard/_projects.html.haml | 6 | ||||
| -rw-r--r-- | app/views/dashboard/projects/starred.html.haml | 6 | ||||
| -rw-r--r-- | app/views/groups/_projects.html.haml | 6 |
4 files changed, 13 insertions, 22 deletions
diff --git a/app/assets/stylesheets/pages/dashboard.scss b/app/assets/stylesheets/pages/dashboard.scss index 5a543a852c2..e408211fc7d 100644 --- a/app/assets/stylesheets/pages/dashboard.scss +++ b/app/assets/stylesheets/pages/dashboard.scss @@ -28,6 +28,10 @@ font-size: 14px; line-height: 24px; + .str-truncated { + max-width: 75%; + } + a { display: block; padding: 8px 15px; @@ -87,16 +91,3 @@ margin-right: 5px; width: 16px; } - -.dash-new-project { - background: $gl-success; - border: 1px solid $gl-success; - - a { - color: #FFF; - } -} - -.dash-list .str-truncated { - max-width: 72%; -} diff --git a/app/views/dashboard/_projects.html.haml b/app/views/dashboard/_projects.html.haml index 3634b2bfd7b..d676576067c 100644 --- a/app/views/dashboard/_projects.html.haml +++ b/app/views/dashboard/_projects.html.haml @@ -3,8 +3,8 @@ .input-group = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control' - if current_user.can_create_project? - .input-group-addon.dash-new-project - = link_to new_project_path do - %strong New project + %span.input-group-btn + = link_to new_project_path, class: 'btn btn-success' do + New project = render 'shared/projects_list', projects: @projects, projects_limit: 20 diff --git a/app/views/dashboard/projects/starred.html.haml b/app/views/dashboard/projects/starred.html.haml index 94de6092563..670f5ac7af7 100644 --- a/app/views/dashboard/projects/starred.html.haml +++ b/app/views/dashboard/projects/starred.html.haml @@ -8,9 +8,9 @@ .input-group = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control' - if current_user.can_create_project? - .input-group-addon.dash-new-project - = link_to new_project_path do - %strong New project + %span.input-group-btn + = link_to new_project_path, class: 'btn btn-success' do + New project = render 'shared/projects_list', projects: @projects, projects_limit: 20, stars: true, avatar: false diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml index 6f53e125c47..4f8aec1c67e 100644 --- a/app/views/groups/_projects.html.haml +++ b/app/views/groups/_projects.html.haml @@ -3,8 +3,8 @@ .input-group = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control' - if can? current_user, :create_projects, @group - .input-group-addon.dash-new-project - = link_to new_project_path(namespace_id: @group.id) do - %strong New project + %span.input-group-btn + = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-success' do + New project = render 'shared/projects_list', projects: @projects, projects_limit: 20 |