Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
cd36f293
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,发现更多精彩内容 >>
未验证
提交
cd36f293
编写于
6月 08, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improve button margin for btn-grouped css class
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
bf9e4826
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
24 addition
and
30 deletion
+24
-30
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+19
-23
app/views/groups/group_members/_group_member.html.haml
app/views/groups/group_members/_group_member.html.haml
+1
-1
app/views/projects/project_members/_project_member.html.haml
app/views/projects/project_members/_project_member.html.haml
+1
-1
app/views/shared/milestones/_milestone.html.haml
app/views/shared/milestones/_milestone.html.haml
+3
-5
未找到文件。
app/assets/stylesheets/framework/buttons.scss
浏览文件 @
cd36f293
...
...
@@ -79,6 +79,23 @@
@include
btn-color
(
$white-light
,
$border-color
,
$white-normal
,
$border-white-normal
,
$white-dark
,
$border-white-dark
,
$btn-white-active
);
}
@mixin
btn-with-margin
{
margin-left
:
$btn-side-margin
;
float
:
left
;
&
.inline
{
float
:
none
;
}
&
.btn-sm
{
margin-left
:
$btn-sm-side-margin
;
}
&
.btn-xs
{
margin-left
:
$btn-xs-side-margin
;
}
}
.btn
{
@include
btn-default
;
@include
btn-white
;
...
...
@@ -142,24 +159,7 @@
}
&
.btn-grouped
{
margin-right
:
$btn-side-margin
;
float
:
left
;
&
.inline
{
float
:
none
;
}
&
:last-child
{
margin-right
:
0
;
}
&
.btn-sm
{
margin-right
:
$btn-sm-side-margin
;
}
&
.btn-xs
{
margin-right
:
$btn-xs-side-margin
;
}
@include
btn-with-margin
;
}
&
.disabled
{
...
...
@@ -203,11 +203,7 @@
.btn-group
{
&
.btn-grouped
{
margin-right
:
7px
;
float
:
left
;
&
:last-child
{
margin-right
:
0
;
}
@include
btn-with-margin
;
}
}
...
...
app/views/groups/group_members/_group_member.html.haml
浏览文件 @
cd36f293
...
...
@@ -34,7 +34,7 @@
%strong
.member-access-level
=
member
.
human_access
-
if
show_controls
-
if
can?
(
current_user
,
:update_group_member
,
member
)
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
=
button_tag
class:
"btn-xs btn
btn-grouped inline
js-toggle-button"
,
title:
'Edit access level'
,
type:
'button'
do
=
icon
(
'pencil'
)
...
...
app/views/projects/project_members/_project_member.html.haml
浏览文件 @
cd36f293
...
...
@@ -32,7 +32,7 @@
.pull-right
%strong
=
member
.
human_access
-
if
can?
(
current_user
,
:update_project_member
,
member
)
=
button_tag
class:
"btn-xs btn js-toggle-button"
,
=
button_tag
class:
"btn-xs btn
-grouped inline btn
js-toggle-button"
,
title:
'Edit access level'
,
type:
'button'
do
=
icon
(
'pencil'
)
...
...
app/views/shared/milestones/_milestone.html.haml
浏览文件 @
cd36f293
...
...
@@ -35,11 +35,9 @@
.col-sm-6
=
render
(
'shared/milestone_expired'
,
milestone:
milestone
)
.col-sm-6
-
if
can?
(
current_user
,
:admin_milestone
,
milestone
.
project
)
and
milestone
.
active?
=
link_to
edit_namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
class:
"btn btn-xs"
do
=
icon
(
'pencil-square-o'
)
=
link_to
edit_namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
class:
"btn btn-xs btn-grouped"
do
Edit
\
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-xs btn-close"
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-xs btn-remove"
do
=
icon
(
'trash-o'
)
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
remote:
true
,
class:
"btn btn-xs btn-close btn-grouped"
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-xs btn-remove btn-grouped"
do
Delete
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录