kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix panel/card styling

Browse source
This commit is contained in:
Annabel Dunstone Gray 2018-05-22 11:11:02 -07:00
parent 79f9a62b73
commit e9a336ae73
No known key found for this signature in database
GPG key ID: 7C8C78A372AD7A2D
5 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/framework/panels.scss
View file

@ -11,6 +11,7 @@
.card-header {
padding: $gl-vert-padding $gl-padding;
line-height: 36px;
color: $white-light;
.controls {
margin-top: -2px;
@ -47,6 +48,7 @@
.card-body {
padding: $gl-padding;
background-color: $white-light;
.form-actions {
margin: -$gl-padding;

5
app/assets/stylesheets/framework/variables.scss
View file

@ -306,6 +306,11 @@ $gl-warning: $orange-500;
$gl-danger: $red-500;
$gl-btn-active-background: rgba(0, 0, 0, 0.16);
$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

4
app/views/admin/users/_user.html.haml
View file

@ -38,7 +38,7 @@
%li.divider
- if user.can_be_removed?
%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',
delete_user_url: admin_user_path(user),
block_user_url: block_admin_user_path(user),
@ -47,7 +47,7 @@
= s_('AdminUsers|Delete user')
%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',
delete_user_url: admin_user_path(user, hard_delete: true),
block_user_url: block_admin_user_path(user),

4
app/views/admin/users/show.html.haml
View file

@ -178,7 +178,7 @@
%p Deleting a user has the following effects:
= render 'users/deletion_guidance', user: @user
%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',
delete_user_url: admin_user_path(@user),
block_user_url: block_admin_user_path(@user),
@ -210,7 +210,7 @@
the user, and projects in them, will also be removed. Commits
to other projects are unaffected.
%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',
delete_user_url: admin_user_path(@user, hard_delete: true),
block_user_url: block_admin_user_path(@user),

2
app/views/groups/edit.html.haml
View file

@ -64,7 +64,7 @@
.card-header Transfer group
.card-body
= 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) } })
= hidden_field_tag 'new_parent_group_id'