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
2de672c4
Commit
2de672c4
authored
Aug 10, 2018
by
Annabel Gray
Committed by
Clement Ho
Aug 10, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add correct styling for .card
parent
d7318ba3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
14 deletions
+19
-14
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+8
-8
app/views/projects/pages/_use.html.haml
app/views/projects/pages/_use.html.haml
+2
-2
app/views/shared/milestones/_issuables.html.haml
app/views/shared/milestones/_issuables.html.haml
+2
-2
app/views/shared/plugins/_index.html.haml
app/views/shared/plugins/_index.html.haml
+2
-2
changelogs/unreleased/50126-blocked-user-card.yml
changelogs/unreleased/50126-blocked-user-card.yml
+5
-0
No files found.
app/views/admin/users/show.html.haml
View file @
2de672c4
...
@@ -132,8 +132,8 @@
...
@@ -132,8 +132,8 @@
.col-md-6
.col-md-6
-
unless
@user
==
current_user
-
unless
@user
==
current_user
-
unless
@user
.
confirmed?
-
unless
@user
.
confirmed?
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
Confirm user
Confirm user
.card-body
.card-body
-
if
@user
.
unconfirmed_email
.
present?
-
if
@user
.
unconfirmed_email
.
present?
...
@@ -143,14 +143,14 @@
...
@@ -143,14 +143,14 @@
=
link_to
'Confirm user'
,
confirm_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
=
link_to
'Confirm user'
,
confirm_admin_user_path
(
@user
),
method: :put
,
class:
"btn btn-info"
,
data:
{
confirm:
'Are you sure?'
}
-
if
@user
.
note
.
present?
-
if
@user
.
note
.
present?
-
text
=
@user
.
note
-
text
=
@user
.
note
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
Admin Note
Admin Note
.card-body
.card-body
%p
=
text
%p
=
text
-
if
@user
.
blocked?
-
if
@user
.
blocked?
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
This user is blocked
This user is blocked
.card-body
.card-body
%p
A blocked user cannot:
%p
A blocked user cannot:
...
@@ -173,8 +173,8 @@
...
@@ -173,8 +173,8 @@
%br
%br
=
link_to
'Block user'
,
block_admin_user_path
(
@user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
,
class:
"btn btn-warning"
=
link_to
'Block user'
,
block_admin_user_path
(
@user
),
data:
{
confirm:
'USER WILL BE BLOCKED! Are you sure?'
},
method: :put
,
class:
"btn btn-warning"
-
if
@user
.
access_locked?
-
if
@user
.
access_locked?
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
This account has been locked
This account has been locked
.card-body
.card-body
%p
This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.
%p
This user has been temporarily locked due to excessive number of failed logins. You may manually unlock the account.
...
...
app/views/projects/pages/_use.html.haml
View file @
2de672c4
-
unless
@project
.
pages_deployed?
-
unless
@project
.
pages_deployed?
.card.b
g
-info
.card.b
order
-info
.card-header
.card-header
.bg-info.text-white
Configure pages
Configure pages
.card-body
.card-body
%p
%p
...
...
app/views/shared/milestones/_issuables.html.haml
View file @
2de672c4
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
-
primary
=
local_assigns
.
fetch
(
:primary
,
false
)
-
primary
=
local_assigns
.
fetch
(
:primary
,
false
)
-
panel_class
=
primary
?
'bg-primary text-white'
:
''
-
panel_class
=
primary
?
'bg-primary text-white'
:
''
.card
{
class:
panel_class
}
.card
.card-header
.card-header
{
class:
panel_class
}
.title
.title
=
title
=
title
-
if
show_counter
-
if
show_counter
...
...
app/views/shared/plugins/_index.html.haml
View file @
2de672c4
...
@@ -19,5 +19,5 @@
...
@@ -19,5 +19,5 @@
.monospace
.monospace
=
File
.
basename
(
file
)
=
File
.
basename
(
file
)
-
else
-
else
%p
.card.bg-light.text-center
.card.bg-light.text-center
No plugins found.
.nothing-here-block
No plugins found.
changelogs/unreleased/50126-blocked-user-card.yml
0 → 100644
View file @
2de672c4
---
title
:
Fix blocked user card style
merge_request
:
6849
author
:
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