Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9afc930b
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,发现更多精彩内容 >>
提交
9afc930b
编写于
10月 16, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make ui-box-show more visible. Refactor some css classes
上级
6404d697
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
30 addition
and
27 deletion
+30
-27
app/assets/stylesheets/common.scss
app/assets/stylesheets/common.scss
+0
-21
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
+2
-0
app/assets/stylesheets/gitlab_bootstrap/common.scss
app/assets/stylesheets/gitlab_bootstrap/common.scss
+21
-0
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+4
-3
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-2
未找到文件。
app/assets/stylesheets/common.scss
浏览文件 @
9afc930b
...
@@ -140,27 +140,6 @@ p.time {
...
@@ -140,27 +140,6 @@ p.time {
border-bottom
:
2px
solid
#F90
;
border-bottom
:
2px
solid
#F90
;
}
}
.status_info
{
font-size
:
14px
;
padding
:
5px
15px
;
line-height
:
26px
;
text-align
:
center
;
float
:
right
;
position
:
relative
;
top
:
-5px
;
@include
border-radius
(
4px
);
&
.success
{
background
:
#4A4
;
color
:
#FFF
;
}
&
.error
{
background
:
#DA4E49
;
color
:
#FFF
;
}
}
.thin_area
{
.thin_area
{
height
:
150px
;
height
:
150px
;
}
}
...
...
app/assets/stylesheets/gitlab_bootstrap/blocks.scss
浏览文件 @
9afc930b
...
@@ -34,6 +34,8 @@
...
@@ -34,6 +34,8 @@
&
.ui-box-show
{
&
.ui-box-show
{
margin
:
20px
0
;
margin
:
20px
0
;
background
:
#FFF
;
background
:
#FFF
;
box-shadow
:
inset
0
1px
0
#fff
,
0
1px
5px
#f1f1f1
;
@include
linear-gradient
(
#fafafa
,
#f1f1f1
);
.control-group
{
.control-group
{
margin-bottom
:
0
;
margin-bottom
:
0
;
...
...
app/assets/stylesheets/gitlab_bootstrap/common.scss
浏览文件 @
9afc930b
...
@@ -87,3 +87,24 @@ pre.well-pre {
...
@@ -87,3 +87,24 @@ pre.well-pre {
font-weight
:
bold
;
font-weight
:
bold
;
@include
box-shadow
(
inset
0
2px
4px
rgba
(
0
,
0
,
0
,.
15
));
@include
box-shadow
(
inset
0
2px
4px
rgba
(
0
,
0
,
0
,.
15
));
}
}
/** Big Labels **/
.state-label
{
font-size
:
14px
;
padding
:
5px
15px
;
text-align
:
center
;
float
:
right
;
position
:
relative
;
top
:
-5px
;
@include
border-radius
(
4px
);
&
.state-label-green
{
background
:
#4A4
;
color
:
#FFF
;
}
&
.state-label-red
{
background
:
#DA4E49
;
color
:
#FFF
;
}
}
app/views/projects/issues/show.html.haml
浏览文件 @
9afc930b
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
.ui-box-head
.ui-box-head
%h4
.box-title
%h4
.box-title
-
if
@issue
.
closed?
-
if
@issue
.
closed?
.
error.status_info
Closed
.
state-label.state-label-red
Closed
=
gfm
escape_once
(
@issue
.
title
)
=
gfm
escape_once
(
@issue
.
title
)
.ui-box-body
.ui-box-body
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
浏览文件 @
9afc930b
...
@@ -3,11 +3,12 @@
...
@@ -3,11 +3,12 @@
%h4
.box-title
%h4
.box-title
=
gfm
escape_once
(
@merge_request
.
title
)
=
gfm
escape_once
(
@merge_request
.
title
)
-
if
@merge_request
.
merged?
-
if
@merge_request
.
merged?
.s
uccess.status_info
.s
tate-label.state-label-green
%i
.icon-ok
%i
.icon-ok
Merged
Merged
-
elsif
@merge_request
.
closed?
-
elsif
@merge_request
.
closed?
.error.status_info
Closed
.state-label.state-label-red
Closed
.ui-box-body
.ui-box-body
%div
%div
...
@@ -32,7 +33,7 @@
...
@@ -32,7 +33,7 @@
%span
%span
%i
.icon-remove
%i
.icon-remove
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
Closed by
#{
link_to_member
(
@project
,
@merge_request
.
closed_event
.
author
)
}
%s
mall
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
%s
pan
#{
time_ago_in_words
(
@merge_request
.
closed_event
.
created_at
)
}
ago.
-
if
@merge_request
.
merged?
-
if
@merge_request
.
merged?
.ui-box-bottom.alert-success
.ui-box-bottom.alert-success
%span
%span
...
...
app/views/projects/milestones/show.html.haml
浏览文件 @
9afc930b
...
@@ -26,9 +26,9 @@
...
@@ -26,9 +26,9 @@
.ui-box-head
.ui-box-head
%h4
.box-title
%h4
.box-title
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
.
error.status_info
Closed
.
state-label.state-label-red
Closed
-
elsif
@milestone
.
expired?
-
elsif
@milestone
.
expired?
.
error.status_info
Expired
.
state-label.state-label-red
Expired
=
gfm
escape_once
(
@milestone
.
title
)
=
gfm
escape_once
(
@milestone
.
title
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录