Commit e9a336ae authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Fix panel/card styling

parent 79f9a62b
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
.card-header { .card-header {
padding: $gl-vert-padding $gl-padding; padding: $gl-vert-padding $gl-padding;
line-height: 36px; line-height: 36px;
color: $white-light;
.controls { .controls {
margin-top: -2px; margin-top: -2px;
...@@ -47,6 +48,7 @@ ...@@ -47,6 +48,7 @@
.card-body { .card-body {
padding: $gl-padding; padding: $gl-padding;
background-color: $white-light;
.form-actions { .form-actions {
margin: -$gl-padding; margin: -$gl-padding;
......
...@@ -306,6 +306,11 @@ $gl-warning: $orange-500; ...@@ -306,6 +306,11 @@ $gl-warning: $orange-500;
$gl-danger: $red-500; $gl-danger: $red-500;
$gl-btn-active-background: rgba(0, 0, 0, 0.16); $gl-btn-active-background: rgba(0, 0, 0, 0.16);
$gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background; $gl-btn-active-gradient: inset 0 2px 3px $gl-btn-active-background;
// Bootstrap override states
$success: $gl-success;
$info: $gl-info;
$warning: $gl-warning;
$danger: $gl-danger;
/* /*
* Commit Diff Colors * Commit Diff Colors
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
%li.divider %li.divider
- if user.can_be_removed? - if user.can_be_removed?
%li %li
%button.delete-user-button.btn.text-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(user), delete_user_url: admin_user_path(user),
block_user_url: block_admin_user_path(user), block_user_url: block_admin_user_path(user),
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
= s_('AdminUsers|Delete user') = s_('AdminUsers|Delete user')
%li %li
%button.delete-user-button.btn.text-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(user, hard_delete: true), delete_user_url: admin_user_path(user, hard_delete: true),
block_user_url: block_admin_user_path(user), block_user_url: block_admin_user_path(user),
......
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
%p Deleting a user has the following effects: %p Deleting a user has the following effects:
= render 'users/deletion_guidance', user: @user = render 'users/deletion_guidance', user: @user
%br %br
%button.delete-user-button.btn.text-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(@user), delete_user_url: admin_user_path(@user),
block_user_url: block_admin_user_path(@user), block_user_url: block_admin_user_path(@user),
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
the user, and projects in them, will also be removed. Commits the user, and projects in them, will also be removed. Commits
to other projects are unaffected. to other projects are unaffected.
%br %br
%button.delete-user-button.btn.text-danger{ data: { toggle: 'modal', %button.delete-user-button.btn.btn-danger{ data: { toggle: 'modal',
target: '#delete-user-modal', target: '#delete-user-modal',
delete_user_url: admin_user_path(@user, hard_delete: true), delete_user_url: admin_user_path(@user, hard_delete: true),
block_user_url: block_admin_user_path(@user), block_user_url: block_admin_user_path(@user),
......
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
.card-header Transfer group .card-header Transfer group
.card-body .card-body
= form_for @group, url: transfer_group_path(@group), method: :put do |f| = form_for @group, url: transfer_group_path(@group), method: :put do |f|
.form-group.row .form-group
= dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: "Search groups", data: { data: parent_group_options(@group) } }) = dropdown_tag('Select parent group', options: { toggle_class: 'js-groups-dropdown', title: 'Parent Group', filter: true, dropdown_class: 'dropdown-open-top dropdown-group-transfer', placeholder: "Search groups", data: { data: parent_group_options(@group) } })
= hidden_field_tag 'new_parent_group_id' = hidden_field_tag 'new_parent_group_id'
......
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