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
0a7ad00a
Commit
0a7ad00a
authored
Jul 18, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove background color from card-body style
parent
f97c4425
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
11 deletions
+15
-11
app/assets/stylesheets/framework/panels.scss
app/assets/stylesheets/framework/panels.scss
+0
-1
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+6
-6
app/views/projects/imports/new.html.haml
app/views/projects/imports/new.html.haml
+2
-2
app/views/projects/pages/_destroy.haml
app/views/projects/pages/_destroy.haml
+2
-2
changelogs/unreleased/update-card-body-style.yml
changelogs/unreleased/update-card-body-style.yml
+5
-0
No files found.
app/assets/stylesheets/framework/panels.scss
View file @
0a7ad00a
...
...
@@ -47,7 +47,6 @@
.card-body
{
padding
:
$gl-padding
;
background-color
:
$white-light
;
.form-actions
{
margin
:
-
$gl-padding
;
...
...
app/views/admin/users/show.html.haml
View file @
0a7ad00a
...
...
@@ -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.b
g
-warning
.card-header
.card.b
order
-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.b
g
-danger
.card-header
.card.b
order
-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.b
g
-danger
.card-header
.card.b
order
-danger
.card-header
.bg-danger.text-white
=
s_
(
'AdminUsers|Delete user and contributions'
)
.card-body
-
if
can?
(
current_user
,
:destroy_user
,
@user
)
...
...
app/views/projects/imports/new.html.haml
View file @
0a7ad00a
...
...
@@ -5,8 +5,8 @@
%hr
-
if
@project
.
import_failed?
.card.b
g
-danger
.card-header
The repository could not be imported.
.card.b
order
-danger
.card-header
.bg-danger.text-white
The repository could not be imported.
.card-body
%pre
:preserve
...
...
app/views/projects/pages/_destroy.haml
View file @
0a7ad00a
-
if
@project
.
pages_deployed?
-
if
can?
(
current_user
,
:remove_pages
,
@project
)
.card.b
g
-danger
.card-header
Remove pages
.card.b
order
-danger
.card-header
.bg-danger.text-white
Remove pages
.errors-holder
.card-body
%p
...
...
changelogs/unreleased/update-card-body-style.yml
0 → 100644
View file @
0a7ad00a
---
title
:
Remove background color from card-body style
merge_request
:
20689
author
:
George Tsiolis
type
:
fixed
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