Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c1824ac7
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
c1824ac7
编写于
8月 08, 2018
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix styling of all card elements
上级
c2396171
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
11 deletion
+11
-11
app/views/admin/users/show.html.haml
app/views/admin/users/show.html.haml
+4
-4
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
+1
-1
未找到文件。
app/views/admin/users/show.html.haml
浏览文件 @
c1824ac7
...
...
@@ -128,8 +128,8 @@
.col-md-6
-
unless
@user
==
current_user
-
unless
@user
.
confirmed?
.card.b
g
-info
.card-header
.card.b
order
-info
.card-header
.bg-info.text-white
Confirm user
.card-body
-
if
@user
.
unconfirmed_email
.
present?
...
...
@@ -162,8 +162,8 @@
%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"
-
if
@user
.
access_locked?
.card.b
g
-info
.card-header
.card.b
order
-info
.card-header
.bg-info.text-white
This account has been locked
.card-body
%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
浏览文件 @
c1824ac7
-
unless
@project
.
pages_deployed?
.card.b
g
-info
.card-header
.card.b
order
-info
.card-header
.bg-info.text-white
Configure pages
.card-body
%p
...
...
app/views/shared/milestones/_issuables.html.haml
浏览文件 @
c1824ac7
...
...
@@ -2,8 +2,8 @@
-
primary
=
local_assigns
.
fetch
(
:primary
,
false
)
-
panel_class
=
primary
?
'bg-primary text-white'
:
''
.card
{
class:
panel_class
}
.card-header
.card
.card-header
{
class:
panel_class
}
.title
=
title
-
if
show_counter
...
...
app/views/shared/plugins/_index.html.haml
浏览文件 @
c1824ac7
...
...
@@ -19,5 +19,5 @@
.monospace
=
File
.
basename
(
file
)
-
else
%p
.card.bg-light.text-center
No plugins found.
.card.bg-light.text-center
.nothing-here-block
No plugins found.
changelogs/unreleased/50126-blocked-user-card.yml
浏览文件 @
c1824ac7
---
title
:
Fix blocked user card style
merge_request
:
merge_request
:
21095
author
:
type
:
fixed
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录