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 | 3 | |
| 4 | 4 | %hr |
| 5 | 5 | |
| 6 | -.ui-box | |
| 6 | +.panel.panel-default | |
| 7 | 7 | .title Sidekiq running processes |
| 8 | 8 | .body |
| 9 | 9 | - if @sidekiq_processes.empty? |
| ... | ... | @@ -40,5 +40,5 @@ |
| 40 | 40 | |
| 41 | 41 | |
| 42 | 42 | |
| 43 | -.ui-box | |
| 43 | +.panel.panel-default | |
| 44 | 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 | %hr |
| 8 | 8 | .row |
| 9 | 9 | .col-md-6 |
| 10 | - .ui-box | |
| 10 | + .panel.panel-default | |
| 11 | 11 | .title |
| 12 | 12 | Group info: |
| 13 | 13 | %ul.well-list |
| ... | ... | @@ -29,7 +29,7 @@ |
| 29 | 29 | %strong |
| 30 | 30 | = @group.created_at.stamp("March 1, 1999") |
| 31 | 31 | |
| 32 | - .ui-box | |
| 32 | + .panel.panel-default | |
| 33 | 33 | .title |
| 34 | 34 | Projects |
| 35 | 35 | %small |
| ... | ... | @@ -45,7 +45,7 @@ |
| 45 | 45 | %span.monospace= project.path_with_namespace + ".git" |
| 46 | 46 | |
| 47 | 47 | .col-md-6 |
| 48 | - .ui-box | |
| 48 | + .panel.panel-default | |
| 49 | 49 | .title |
| 50 | 50 | Add user(s) to the group: |
| 51 | 51 | .body.form-holder |
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 | = select_tag :group_access, options_for_select(UsersGroup.group_access_roles), class: "project-access-select select2" |
| 61 | 61 | %hr |
| 62 | 62 | = submit_tag 'Add users into group', class: "btn btn-create" |
| 63 | - .ui-box | |
| 63 | + .panel.panel-default | |
| 64 | 64 | .title |
| 65 | 65 | %strong #{@group.name} |
| 66 | 66 | Group Members | ... | ... |
app/views/admin/hooks/index.html.haml
app/views/admin/projects/index.html.haml
app/views/admin/projects/show.html.haml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | %hr |
| 7 | 7 | .row |
| 8 | 8 | .col-md-6 |
| 9 | - .ui-box | |
| 9 | + .panel.panel-default | |
| 10 | 10 | .title |
| 11 | 11 | Project info: |
| 12 | 12 | %ul.well-list |
| ... | ... | @@ -75,7 +75,7 @@ |
| 75 | 75 | = visibility_level_icon(@project.visibility_level) |
| 76 | 76 | = visibility_level_label(@project.visibility_level) |
| 77 | 77 | |
| 78 | - .ui-box | |
| 78 | + .panel.panel-default | |
| 79 | 79 | .title |
| 80 | 80 | Transfer project |
| 81 | 81 | .body |
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | |
| 93 | 93 | .col-md-6 |
| 94 | 94 | - if @group |
| 95 | - .ui-box | |
| 95 | + .panel.panel-default | |
| 96 | 96 | .title |
| 97 | 97 | %strong #{@group.name} |
| 98 | 98 | group members (#{@group.users_groups.count}) |
| ... | ... | @@ -103,7 +103,7 @@ |
| 103 | 103 | - @group.users_groups.order('group_access DESC').each do |member| |
| 104 | 104 | = render 'users_groups/users_group', member: member, show_controls: false |
| 105 | 105 | |
| 106 | - .ui-box | |
| 106 | + .panel.panel-default | |
| 107 | 107 | .title |
| 108 | 108 | Project members |
| 109 | 109 | %small | ... | ... |
app/views/admin/users/index.html.haml
app/views/admin/users/show.html.haml
| ... | ... | @@ -14,7 +14,7 @@ |
| 14 | 14 | |
| 15 | 15 | .row |
| 16 | 16 | .col-md-6 |
| 17 | - .ui-box | |
| 17 | + .panel.panel-default | |
| 18 | 18 | .title |
| 19 | 19 | Account: |
| 20 | 20 | .pull-right |
| ... | ... | @@ -118,7 +118,7 @@ |
| 118 | 118 | |
| 119 | 119 | .col-md-6 |
| 120 | 120 | - if @user.users_groups.present? |
| 121 | - .ui-box | |
| 121 | + .panel.panel-default | |
| 122 | 122 | .title Groups: |
| 123 | 123 | %ul.well-list |
| 124 | 124 | - @user.users_groups.each do |user_group| |
| ... | ... | @@ -132,7 +132,7 @@ |
| 132 | 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 | 133 | %i.icon-remove.icon-white |
| 134 | 134 | |
| 135 | - .ui-box | |
| 135 | + .panel.panel-default | |
| 136 | 136 | .title Projects (#{@projects.count}) |
| 137 | 137 | %ul.well-list |
| 138 | 138 | - @projects.sort_by(&:name_with_namespace).each do |project| | ... | ... |
app/views/dashboard/_groups.html.haml
app/views/dashboard/_projects.html.haml
app/views/groups/_projects.html.haml
app/views/groups/edit.html.haml
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | .col-md-10 |
| 18 | 18 | .tab-content |
| 19 | 19 | .tab-pane.active#tab-edit |
| 20 | - .ui-box | |
| 20 | + .panel.panel-default | |
| 21 | 21 | .title |
| 22 | 22 | %strong= @group.name |
| 23 | 23 | group settings: |
| ... | ... | @@ -61,7 +61,7 @@ |
| 61 | 61 | = f.submit 'Save group', class: "btn btn-save" |
| 62 | 62 | |
| 63 | 63 | .tab-pane#tab-projects |
| 64 | - .ui-box | |
| 64 | + .panel.panel-default | |
| 65 | 65 | .title |
| 66 | 66 | %strong= @group.name |
| 67 | 67 | projects: |
| ... | ... | @@ -84,7 +84,7 @@ |
| 84 | 84 | .nothing-here-block This group has no projects yet |
| 85 | 85 | |
| 86 | 86 | .tab-pane#tab-remove |
| 87 | - .ui-box.ui-box-danger | |
| 87 | + .panel.panel-default.panel.panel-default-danger | |
| 88 | 88 | .title Remove group |
| 89 | 89 | .body |
| 90 | 90 | %p | ... | ... |
app/views/groups/members.html.haml
app/views/help/index.html.haml
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | |
| 19 | 19 | .row |
| 20 | 20 | .col-md-4 |
| 21 | - .ui-box | |
| 21 | + .panel.panel-default | |
| 22 | 22 | .title |
| 23 | 23 | Quick help |
| 24 | 24 | %ul.well-list |
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | = link_to "shortcuts", '#', onclick: "new Shortcuts()" |
| 35 | 35 | |
| 36 | 36 | .col-md-8 |
| 37 | - .ui-box.documentation | |
| 37 | + .panel.panel-default.documentation | |
| 38 | 38 | .title Documentation |
| 39 | 39 | |
| 40 | 40 | = preserve do | ... | ... |
app/views/profiles/emails/index.html.haml
app/views/profiles/groups/index.html.haml
app/views/profiles/keys/index.html.haml
app/views/profiles/keys/show.html.haml
app/views/projects/compare/show.html.haml
app/views/projects/edit.html.haml
| ... | ... | @@ -106,7 +106,7 @@ |
| 106 | 106 | |
| 107 | 107 | .js-toggle-content.hide |
| 108 | 108 | - if can? current_user, :archive_project, @project |
| 109 | - .ui-box.ui-box-danger | |
| 109 | + .panel.panel-default.panel.panel-default-danger | |
| 110 | 110 | .title |
| 111 | 111 | - if @project.archived? |
| 112 | 112 | Unarchive project |
| ... | ... | @@ -137,7 +137,7 @@ |
| 137 | 137 | .nothing-here-block Only the project owner can archive a project |
| 138 | 138 | |
| 139 | 139 | - if can?(current_user, :change_namespace, @project) |
| 140 | - .ui-box.ui-box-danger | |
| 140 | + .panel.panel-default.panel.panel-default-danger | |
| 141 | 141 | .title Transfer project |
| 142 | 142 | .errors-holder |
| 143 | 143 | .form-holder |
| ... | ... | @@ -157,7 +157,7 @@ |
| 157 | 157 | - else |
| 158 | 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 | 161 | .title Rename repository |
| 162 | 162 | .errors-holder |
| 163 | 163 | .form-holder |
| ... | ... | @@ -177,7 +177,7 @@ |
| 177 | 177 | = f.submit 'Rename', class: "btn btn-remove" |
| 178 | 178 | |
| 179 | 179 | - if can?(current_user, :remove_project, @project) |
| 180 | - .ui-box.ui-box-danger | |
| 180 | + .panel.panel-default.panel.panel-default-danger | |
| 181 | 181 | .title Remove project |
| 182 | 182 | .body |
| 183 | 183 | %p | ... | ... |
app/views/projects/hooks/index.html.haml
app/views/projects/issues/_issues.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/show/_commits.html.haml
app/views/projects/milestones/_issues.html.haml
app/views/projects/milestones/index.html.haml
app/views/projects/milestones/show.html.haml
| ... | ... | @@ -84,13 +84,13 @@ |
| 84 | 84 | .tab-pane#tab-merge-requests |
| 85 | 85 | .row |
| 86 | 86 | .col-md-6 |
| 87 | - .ui-box | |
| 87 | + .panel.panel-default | |
| 88 | 88 | .title Open |
| 89 | 89 | %ul.well-list |
| 90 | 90 | - @merge_requests.opened.each do |merge_request| |
| 91 | 91 | = render 'merge_request', merge_request: merge_request |
| 92 | 92 | .col-md-6 |
| 93 | - .ui-box | |
| 93 | + .panel.panel-default | |
| 94 | 94 | .title Closed |
| 95 | 95 | %ul.well-list |
| 96 | 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
app/views/shared/_issues.html.haml
app/views/shared/_merge_requests.html.haml
app/views/users/_profile.html.haml
app/views/users/_projects.html.haml