Commit 6dcbe1b43c50229fd0dff69eba2c6ab658d91ad2
1 parent
e6beb609
Exists in
spb-stable
and in
2 other branches
Replace ui-box with panel.panel-default
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
33 changed files
with
49 additions
and
49 deletions
Show diff stats
app/views/admin/background_jobs/show.html.haml
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | 3 | ||
| 4 | %hr | 4 | %hr |
| 5 | 5 | ||
| 6 | -.ui-box | 6 | +.panel.panel-default |
| 7 | .title Sidekiq running processes | 7 | .title Sidekiq running processes |
| 8 | .body | 8 | .body |
| 9 | - if @sidekiq_processes.empty? | 9 | - if @sidekiq_processes.empty? |
| @@ -40,5 +40,5 @@ | @@ -40,5 +40,5 @@ | ||
| 40 | 40 | ||
| 41 | 41 | ||
| 42 | 42 | ||
| 43 | -.ui-box | 43 | +.panel.panel-default |
| 44 | %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} | 44 | %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"} |
app/views/admin/groups/show.html.haml
| @@ -7,7 +7,7 @@ | @@ -7,7 +7,7 @@ | ||
| 7 | %hr | 7 | %hr |
| 8 | .row | 8 | .row |
| 9 | .col-md-6 | 9 | .col-md-6 |
| 10 | - .ui-box | 10 | + .panel.panel-default |
| 11 | .title | 11 | .title |
| 12 | Group info: | 12 | Group info: |
| 13 | %ul.well-list | 13 | %ul.well-list |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | %strong | 29 | %strong |
| 30 | = @group.created_at.stamp("March 1, 1999") | 30 | = @group.created_at.stamp("March 1, 1999") |
| 31 | 31 | ||
| 32 | - .ui-box | 32 | + .panel.panel-default |
| 33 | .title | 33 | .title |
| 34 | Projects | 34 | Projects |
| 35 | %small | 35 | %small |
| @@ -45,7 +45,7 @@ | @@ -45,7 +45,7 @@ | ||
| 45 | %span.monospace= project.path_with_namespace + ".git" | 45 | %span.monospace= project.path_with_namespace + ".git" |
| 46 | 46 | ||
| 47 | .col-md-6 | 47 | .col-md-6 |
| 48 | - .ui-box | 48 | + .panel.panel-default |
| 49 | .title | 49 | .title |
| 50 | Add user(s) to the group: | 50 | Add user(s) to the group: |
| 51 | .body.form-holder | 51 | .body.form-holder |
| @@ -60,7 +60,7 @@ | @@ -60,7 +60,7 @@ | ||
| 60 | = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2" | 60 | = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2" |
| 61 | %hr | 61 | %hr |
| 62 | = submit_tag 'Add users into group', class: "btn btn-create" | 62 | = submit_tag 'Add users into group', class: "btn btn-create" |
| 63 | - .ui-box | 63 | + .panel.panel-default |
| 64 | .title | 64 | .title |
| 65 | %strong #{@group.name} | 65 | %strong #{@group.name} |
| 66 | Group Members | 66 | Group Members |
app/views/admin/hooks/index.html.haml
app/views/admin/projects/index.html.haml
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | = link_to "Reset", admin_projects_path, class: "btn" | 37 | = link_to "Reset", admin_projects_path, class: "btn" |
| 38 | 38 | ||
| 39 | .col-md-8 | 39 | .col-md-8 |
| 40 | - .ui-box | 40 | + .panel.panel-default |
| 41 | .title | 41 | .title |
| 42 | Projects (#{@projects.total_count}) | 42 | Projects (#{@projects.total_count}) |
| 43 | .pull-right | 43 | .pull-right |
app/views/admin/projects/show.html.haml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | %hr | 6 | %hr |
| 7 | .row | 7 | .row |
| 8 | .col-md-6 | 8 | .col-md-6 |
| 9 | - .ui-box | 9 | + .panel.panel-default |
| 10 | .title | 10 | .title |
| 11 | Project info: | 11 | Project info: |
| 12 | %ul.well-list | 12 | %ul.well-list |
| @@ -75,7 +75,7 @@ | @@ -75,7 +75,7 @@ | ||
| 75 | = visibility_level_icon(@project.visibility_level) | 75 | = visibility_level_icon(@project.visibility_level) |
| 76 | = visibility_level_label(@project.visibility_level) | 76 | = visibility_level_label(@project.visibility_level) |
| 77 | 77 | ||
| 78 | - .ui-box | 78 | + .panel.panel-default |
| 79 | .title | 79 | .title |
| 80 | Transfer project | 80 | Transfer project |
| 81 | .body | 81 | .body |
| @@ -92,7 +92,7 @@ | @@ -92,7 +92,7 @@ | ||
| 92 | 92 | ||
| 93 | .col-md-6 | 93 | .col-md-6 |
| 94 | - if @group | 94 | - if @group |
| 95 | - .ui-box | 95 | + .panel.panel-default |
| 96 | .title | 96 | .title |
| 97 | %strong #{@group.name} | 97 | %strong #{@group.name} |
| 98 | group members (#{@group.users_groups.count}) | 98 | group members (#{@group.users_groups.count}) |
| @@ -103,7 +103,7 @@ | @@ -103,7 +103,7 @@ | ||
| 103 | - @group.users_groups.order('group_access DESC').each do |member| | 103 | - @group.users_groups.order('group_access DESC').each do |member| |
| 104 | = render 'users_groups/users_group', member: member, show_controls: false | 104 | = render 'users_groups/users_group', member: member, show_controls: false |
| 105 | 105 | ||
| 106 | - .ui-box | 106 | + .panel.panel-default |
| 107 | .title | 107 | .title |
| 108 | Project members | 108 | Project members |
| 109 | %small | 109 | %small |
app/views/admin/users/index.html.haml
| @@ -28,7 +28,7 @@ | @@ -28,7 +28,7 @@ | ||
| 28 | = link_to 'Reset', admin_users_path, class: "btn btn-cancel" | 28 | = link_to 'Reset', admin_users_path, class: "btn btn-cancel" |
| 29 | 29 | ||
| 30 | .col-md-9 | 30 | .col-md-9 |
| 31 | - .ui-box | 31 | + .panel.panel-default |
| 32 | .title | 32 | .title |
| 33 | Users (#{@users.total_count}) | 33 | Users (#{@users.total_count}) |
| 34 | .pull-right | 34 | .pull-right |
app/views/admin/users/show.html.haml
| @@ -14,7 +14,7 @@ | @@ -14,7 +14,7 @@ | ||
| 14 | 14 | ||
| 15 | .row | 15 | .row |
| 16 | .col-md-6 | 16 | .col-md-6 |
| 17 | - .ui-box | 17 | + .panel.panel-default |
| 18 | .title | 18 | .title |
| 19 | Account: | 19 | Account: |
| 20 | .pull-right | 20 | .pull-right |
| @@ -118,7 +118,7 @@ | @@ -118,7 +118,7 @@ | ||
| 118 | 118 | ||
| 119 | .col-md-6 | 119 | .col-md-6 |
| 120 | - if @user.users_groups.present? | 120 | - if @user.users_groups.present? |
| 121 | - .ui-box | 121 | + .panel.panel-default |
| 122 | .title Groups: | 122 | .title Groups: |
| 123 | %ul.well-list | 123 | %ul.well-list |
| 124 | - @user.users_groups.each do |user_group| | 124 | - @user.users_groups.each do |user_group| |
| @@ -132,7 +132,7 @@ | @@ -132,7 +132,7 @@ | ||
| 132 | = link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do | 132 | = link_to group_users_group_path(group, user_group), data: { confirm: remove_user_from_group_message(group, @user) }, method: :delete, remote: true, class: "btn-tiny btn btn-remove", title: 'Remove user from group' do |
| 133 | %i.icon-remove.icon-white | 133 | %i.icon-remove.icon-white |
| 134 | 134 | ||
| 135 | - .ui-box | 135 | + .panel.panel-default |
| 136 | .title Projects (#{@projects.count}) | 136 | .title Projects (#{@projects.count}) |
| 137 | %ul.well-list | 137 | %ul.well-list |
| 138 | - @projects.sort_by(&:name_with_namespace).each do |project| | 138 | - @projects.sort_by(&:name_with_namespace).each do |project| |
app/views/dashboard/_groups.html.haml
| 1 | -.ui-box | 1 | +.panel.panel-default |
| 2 | .title.clearfix | 2 | .title.clearfix |
| 3 | = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' | 3 | = search_field_tag :filter_group, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' |
| 4 | - if current_user.can_create_group? | 4 | - if current_user.can_create_group? |
app/views/dashboard/_projects.html.haml
| 1 | -.ui-box | 1 | +.panel.panel-default |
| 2 | .title.clearfix | 2 | .title.clearfix |
| 3 | = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' | 3 | = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'dash-filter form-control' |
| 4 | - if current_user.can_create_project? | 4 | - if current_user.can_create_project? |
app/views/groups/_projects.html.haml
app/views/groups/edit.html.haml
| @@ -17,7 +17,7 @@ | @@ -17,7 +17,7 @@ | ||
| 17 | .col-md-10 | 17 | .col-md-10 |
| 18 | .tab-content | 18 | .tab-content |
| 19 | .tab-pane.active#tab-edit | 19 | .tab-pane.active#tab-edit |
| 20 | - .ui-box | 20 | + .panel.panel-default |
| 21 | .title | 21 | .title |
| 22 | %strong= @group.name | 22 | %strong= @group.name |
| 23 | group settings: | 23 | group settings: |
| @@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
| 61 | = f.submit 'Save group', class: "btn btn-save" | 61 | = f.submit 'Save group', class: "btn btn-save" |
| 62 | 62 | ||
| 63 | .tab-pane#tab-projects | 63 | .tab-pane#tab-projects |
| 64 | - .ui-box | 64 | + .panel.panel-default |
| 65 | .title | 65 | .title |
| 66 | %strong= @group.name | 66 | %strong= @group.name |
| 67 | projects: | 67 | projects: |
| @@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
| 84 | .nothing-here-block This group has no projects yet | 84 | .nothing-here-block This group has no projects yet |
| 85 | 85 | ||
| 86 | .tab-pane#tab-remove | 86 | .tab-pane#tab-remove |
| 87 | - .ui-box.ui-box-danger | 87 | + .panel.panel-default.panel.panel-default-danger |
| 88 | .title Remove group | 88 | .title Remove group |
| 89 | .body | 89 | .body |
| 90 | %p | 90 | %p |
app/views/groups/members.html.haml
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | .js-toggle-content.hide.new-group-member-holder | 24 | .js-toggle-content.hide.new-group-member-holder |
| 25 | = render "new_group_member" | 25 | = render "new_group_member" |
| 26 | 26 | ||
| 27 | -.ui-box.prepend-top-20 | 27 | +.panel.panel-default.prepend-top-20 |
| 28 | .title | 28 | .title |
| 29 | %strong #{@group.name} | 29 | %strong #{@group.name} |
| 30 | group members | 30 | group members |
app/views/help/index.html.haml
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | 18 | ||
| 19 | .row | 19 | .row |
| 20 | .col-md-4 | 20 | .col-md-4 |
| 21 | - .ui-box | 21 | + .panel.panel-default |
| 22 | .title | 22 | .title |
| 23 | Quick help | 23 | Quick help |
| 24 | %ul.well-list | 24 | %ul.well-list |
| @@ -34,7 +34,7 @@ | @@ -34,7 +34,7 @@ | ||
| 34 | = link_to "shortcuts", '#', onclick: "new Shortcuts()" | 34 | = link_to "shortcuts", '#', onclick: "new Shortcuts()" |
| 35 | 35 | ||
| 36 | .col-md-8 | 36 | .col-md-8 |
| 37 | - .ui-box.documentation | 37 | + .panel.panel-default.documentation |
| 38 | .title Documentation | 38 | .title Documentation |
| 39 | 39 | ||
| 40 | = preserve do | 40 | = preserve do |
app/views/profiles/emails/index.html.haml
app/views/profiles/groups/index.html.haml
| @@ -8,7 +8,7 @@ | @@ -8,7 +8,7 @@ | ||
| 8 | %p.light | 8 | %p.light |
| 9 | Group members have access to all a group's projects | 9 | Group members have access to all a group's projects |
| 10 | %hr | 10 | %hr |
| 11 | -.ui-box | 11 | +.panel.panel-default |
| 12 | .title | 12 | .title |
| 13 | %strong Groups | 13 | %strong Groups |
| 14 | (#{@user_groups.count}) | 14 | (#{@user_groups.count}) |
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/compare/show.html.haml
| @@ -6,7 +6,7 @@ | @@ -6,7 +6,7 @@ | ||
| 6 | = render "form" | 6 | = render "form" |
| 7 | 7 | ||
| 8 | - if @commits.present? | 8 | - if @commits.present? |
| 9 | - %div.ui-box | 9 | + %div.panel.panel-default |
| 10 | .title | 10 | .title |
| 11 | Commits (#{@commits.count}) | 11 | Commits (#{@commits.count}) |
| 12 | - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE | 12 | - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE |
app/views/projects/edit.html.haml
| @@ -106,7 +106,7 @@ | @@ -106,7 +106,7 @@ | ||
| 106 | 106 | ||
| 107 | .js-toggle-content.hide | 107 | .js-toggle-content.hide |
| 108 | - if can? current_user, :archive_project, @project | 108 | - if can? current_user, :archive_project, @project |
| 109 | - .ui-box.ui-box-danger | 109 | + .panel.panel-default.panel.panel-default-danger |
| 110 | .title | 110 | .title |
| 111 | - if @project.archived? | 111 | - if @project.archived? |
| 112 | Unarchive project | 112 | Unarchive project |
| @@ -137,7 +137,7 @@ | @@ -137,7 +137,7 @@ | ||
| 137 | .nothing-here-block Only the project owner can archive a project | 137 | .nothing-here-block Only the project owner can archive a project |
| 138 | 138 | ||
| 139 | - if can?(current_user, :change_namespace, @project) | 139 | - if can?(current_user, :change_namespace, @project) |
| 140 | - .ui-box.ui-box-danger | 140 | + .panel.panel-default.panel.panel-default-danger |
| 141 | .title Transfer project | 141 | .title Transfer project |
| 142 | .errors-holder | 142 | .errors-holder |
| 143 | .form-holder | 143 | .form-holder |
| @@ -157,7 +157,7 @@ | @@ -157,7 +157,7 @@ | ||
| 157 | - else | 157 | - else |
| 158 | .nothing-here-block Only the project owner can transfer a project | 158 | .nothing-here-block Only the project owner can transfer a project |
| 159 | 159 | ||
| 160 | - .ui-box.ui-box-danger | 160 | + .panel.panel-default.panel.panel-default-danger |
| 161 | .title Rename repository | 161 | .title Rename repository |
| 162 | .errors-holder | 162 | .errors-holder |
| 163 | .form-holder | 163 | .form-holder |
| @@ -177,7 +177,7 @@ | @@ -177,7 +177,7 @@ | ||
| 177 | = f.submit 'Rename', class: "btn btn-remove" | 177 | = f.submit 'Rename', class: "btn btn-remove" |
| 178 | 178 | ||
| 179 | - if can?(current_user, :remove_project, @project) | 179 | - if can?(current_user, :remove_project, @project) |
| 180 | - .ui-box.ui-box-danger | 180 | + .panel.panel-default.panel.panel-default-danger |
| 181 | .title Remove project | 181 | .title Remove project |
| 182 | .body | 182 | .body |
| 183 | %p | 183 | %p |
app/views/projects/hooks/index.html.haml
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | = f.submit "Add Web Hook", class: "btn btn-create" | 51 | = f.submit "Add Web Hook", class: "btn btn-create" |
| 52 | 52 | ||
| 53 | -if @hooks.any? | 53 | -if @hooks.any? |
| 54 | - .ui-box | 54 | + .panel.panel-default |
| 55 | .title | 55 | .title |
| 56 | Web hooks (#{@hooks.count}) | 56 | Web hooks (#{@hooks.count}) |
| 57 | %ul.well-list | 57 | %ul.well-list |
app/views/projects/issues/_issues.html.haml
| @@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
| 61 | = hidden_field_tag :status, params[:status] | 61 | = hidden_field_tag :status, params[:status] |
| 62 | = button_tag "Update issues", class: "btn update_selected_issues btn-save" | 62 | = button_tag "Update issues", class: "btn update_selected_issues btn-save" |
| 63 | 63 | ||
| 64 | -.ui-box | 64 | +.panel.panel-default |
| 65 | %ul.well-list.issues-list | 65 | %ul.well-list.issues-list |
| 66 | = render @issues | 66 | = render @issues |
| 67 | - if @issues.blank? | 67 | - if @issues.blank? |
app/views/projects/merge_requests/_new_submit.html.haml
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | = f.submit 'Submit merge request', class: "btn btn-create" | 58 | = f.submit 'Submit merge request', class: "btn btn-create" |
| 59 | 59 | ||
| 60 | .mr-compare | 60 | .mr-compare |
| 61 | - %div.ui-box | 61 | + %div.panel.panel-default |
| 62 | .title | 62 | .title |
| 63 | Commits (#{@commits.count}) | 63 | Commits (#{@commits.count}) |
| 64 | - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE | 64 | - if @commits.size > MergeRequestDiff::COMMITS_SAFE_SIZE |
app/views/projects/merge_requests/index.html.haml
| @@ -61,7 +61,7 @@ | @@ -61,7 +61,7 @@ | ||
| 61 | .pull-right | 61 | .pull-right |
| 62 | = render 'shared/sort_dropdown' | 62 | = render 'shared/sort_dropdown' |
| 63 | 63 | ||
| 64 | - .ui-box | 64 | + .panel.panel-default |
| 65 | %ul.well-list.mr-list | 65 | %ul.well-list.mr-list |
| 66 | = render @merge_requests | 66 | = render @merge_requests |
| 67 | - if @merge_requests.blank? | 67 | - if @merge_requests.blank? |
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/milestones/_issues.html.haml
app/views/projects/milestones/index.html.haml
| @@ -20,7 +20,7 @@ | @@ -20,7 +20,7 @@ | ||
| 20 | = link_to project_milestones_path(@project, f: "all") do | 20 | = link_to project_milestones_path(@project, f: "all") do |
| 21 | All | 21 | All |
| 22 | .col-md-9 | 22 | .col-md-9 |
| 23 | - .ui-box | 23 | + .panel.panel-default |
| 24 | %ul.well-list | 24 | %ul.well-list |
| 25 | = render @milestones | 25 | = render @milestones |
| 26 | 26 |
app/views/projects/milestones/show.html.haml
| @@ -84,13 +84,13 @@ | @@ -84,13 +84,13 @@ | ||
| 84 | .tab-pane#tab-merge-requests | 84 | .tab-pane#tab-merge-requests |
| 85 | .row | 85 | .row |
| 86 | .col-md-6 | 86 | .col-md-6 |
| 87 | - .ui-box | 87 | + .panel.panel-default |
| 88 | .title Open | 88 | .title Open |
| 89 | %ul.well-list | 89 | %ul.well-list |
| 90 | - @merge_requests.opened.each do |merge_request| | 90 | - @merge_requests.opened.each do |merge_request| |
| 91 | = render 'merge_request', merge_request: merge_request | 91 | = render 'merge_request', merge_request: merge_request |
| 92 | .col-md-6 | 92 | .col-md-6 |
| 93 | - .ui-box | 93 | + .panel.panel-default |
| 94 | .title Closed | 94 | .title Closed |
| 95 | %ul.well-list | 95 | %ul.well-list |
| 96 | - @merge_requests.closed.each do |merge_request| | 96 | - @merge_requests.closed.each do |merge_request| |
app/views/projects/team_members/_group_members.html.haml
app/views/projects/team_members/_team.html.haml
| 1 | .team-table | 1 | .team-table |
| 2 | - can_admin_project = (can? current_user, :admin_project, @project) | 2 | - can_admin_project = (can? current_user, :admin_project, @project) |
| 3 | - .ui-box | 3 | + .panel.panel-default |
| 4 | .title | 4 | .title |
| 5 | %strong #{@project.name} | 5 | %strong #{@project.name} |
| 6 | project members (#{members.count}) | 6 | project members (#{members.count}) |
app/views/shared/_issues.html.haml
| 1 | - if @issues.any? | 1 | - if @issues.any? |
| 2 | - @issues.group_by(&:project).each do |group| | 2 | - @issues.group_by(&:project).each do |group| |
| 3 | - .ui-box.ui-box-small | 3 | + .panel.panel-default.panel.panel-default-small |
| 4 | - project = group[0] | 4 | - project = group[0] |
| 5 | .title | 5 | .title |
| 6 | = link_to_project project | 6 | = link_to_project project |
app/views/shared/_merge_requests.html.haml
| 1 | - if @merge_requests.any? | 1 | - if @merge_requests.any? |
| 2 | - @merge_requests.group_by(&:target_project).each do |group| | 2 | - @merge_requests.group_by(&:target_project).each do |group| |
| 3 | - .ui-box.ui-box-small | 3 | + .panel.panel-default.panel.panel-default-small |
| 4 | - project = group[0] | 4 | - project = group[0] |
| 5 | .title | 5 | .title |
| 6 | = link_to_project project | 6 | = link_to_project project |
app/views/users/_profile.html.haml
app/views/users/_projects.html.haml