diff options
author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-18 14:32:41 +0000 |
---|---|---|
committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-07-18 14:32:41 +0000 |
commit | 11deffa39f2b07605c3a924f227d3176158b51bc (patch) | |
tree | bf43ac8967b693654e21354964cfcb91d5872a6d | |
parent | dc8efd0108c399e31dab61b6d3754cc0f41fd9e8 (diff) | |
parent | 0a7ad00a4082a4da7486308a95e7edfdd5f846bb (diff) | |
download | gitlab-ce-11deffa39f2b07605c3a924f227d3176158b51bc.tar.gz |
Merge branch 'update-card-body-style' into 'master'
Remove background color from card-body style
Closes #49350
See merge request gitlab-org/gitlab-ce!20689
-rw-r--r-- | app/assets/stylesheets/framework/panels.scss | 1 | ||||
-rw-r--r-- | app/views/admin/users/show.html.haml | 12 | ||||
-rw-r--r-- | app/views/projects/imports/new.html.haml | 4 | ||||
-rw-r--r-- | app/views/projects/pages/_destroy.haml | 4 | ||||
-rw-r--r-- | changelogs/unreleased/update-card-body-style.yml | 5 |
5 files changed, 15 insertions, 11 deletions
diff --git a/app/assets/stylesheets/framework/panels.scss b/app/assets/stylesheets/framework/panels.scss index a8e28104a94..5ca4d944d73 100644 --- a/app/assets/stylesheets/framework/panels.scss +++ b/app/assets/stylesheets/framework/panels.scss @@ -47,7 +47,6 @@ .card-body { padding: $gl-padding; - background-color: $white-light; .form-actions { margin: -$gl-padding; diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index b0562226f5f..f730fd05176 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -149,8 +149,8 @@ %br = link_to 'Unblock user', unblock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' } - else - .card.bg-warning - .card-header + .card.border-warning + .card-header.bg-warning.text-white Block this user .card-body %p Blocking user has the following effects: @@ -170,8 +170,8 @@ %br = link_to 'Unlock user', unlock_admin_user_path(@user), method: :put, class: "btn btn-info", data: { confirm: 'Are you sure?' } - .card.bg-danger - .card-header + .card.border-danger + .card-header.bg-danger.text-white = s_('AdminUsers|Delete user') .card-body - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) @@ -196,8 +196,8 @@ %p You don't have access to delete this user. - .card.bg-danger - .card-header + .card.border-danger + .card-header.bg-danger.text-white = s_('AdminUsers|Delete user and contributions') .card-body - if can?(current_user, :destroy_user, @user) diff --git a/app/views/projects/imports/new.html.haml b/app/views/projects/imports/new.html.haml index ca82054d799..8ce822c43b7 100644 --- a/app/views/projects/imports/new.html.haml +++ b/app/views/projects/imports/new.html.haml @@ -5,8 +5,8 @@ %hr - if @project.import_failed? - .card.bg-danger - .card-header The repository could not be imported. + .card.border-danger + .card-header.bg-danger.text-white The repository could not be imported. .card-body %pre :preserve diff --git a/app/views/projects/pages/_destroy.haml b/app/views/projects/pages/_destroy.haml index 9b77c4e3494..ae8c801b705 100644 --- a/app/views/projects/pages/_destroy.haml +++ b/app/views/projects/pages/_destroy.haml @@ -1,7 +1,7 @@ - if @project.pages_deployed? - if can?(current_user, :remove_pages, @project) - .card.bg-danger - .card-header Remove pages + .card.border-danger + .card-header.bg-danger.text-white Remove pages .errors-holder .card-body %p diff --git a/changelogs/unreleased/update-card-body-style.yml b/changelogs/unreleased/update-card-body-style.yml new file mode 100644 index 00000000000..d9197c18502 --- /dev/null +++ b/changelogs/unreleased/update-card-body-style.yml @@ -0,0 +1,5 @@ +--- +title: Remove background color from card-body style +merge_request: 20689 +author: George Tsiolis +type: fixed |