Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
e9a336ae
Commit
e9a336ae
authored
May 22, 2018
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix panel/card styling
parent
79f9a62b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+2
-0
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+5
-0
app/views/admin/users/_user.html.haml
app/views/admin/users/_user.html.haml
+2
-2
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+2
-2
app/views/groups/edit.html.haml
app/views/groups/edit.html.haml
+1
-1
No files found.
app/assets/stylesheets/framework/panels.scss
View file @
e9a336ae
...
...
@@ -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
;
...
...
app/assets/stylesheets/framework/variables.scss
View file @
e9a336ae
...
...
@@ -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
...
...
app/views/admin/users/_user.html.haml
View file @
e9a336ae
...
...
@@ -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
),
...
...
app/views/admin/users/show.html.haml
View file @
e9a336ae
...
...
@@ -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
),
...
...
app/views/groups/edit.html.haml
View file @
e9a336ae
...
...
@@ -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'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment