Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
272337e8
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,发现更多精彩内容 >>
提交
272337e8
编写于
1月 27, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'ui-updates' into 'master'
UI updates See merge request !8669
上级
2b78774a
ca40ef95
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
6 addition
and
8 deletion
+6
-8
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+1
-1
app/assets/stylesheets/framework/variables.scss
app/assets/stylesheets/framework/variables.scss
+1
-1
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+2
-2
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+1
-3
spec/features/issues/filtered_search/filter_issues_spec.rb
spec/features/issues/filtered_search/filter_issues_spec.rb
+1
-1
未找到文件。
app/assets/stylesheets/framework/header.scss
浏览文件 @
272337e8
...
@@ -71,7 +71,7 @@ header {
...
@@ -71,7 +71,7 @@ header {
&
:focus
,
&
:focus
,
&
:active
{
&
:active
{
background-color
:
$gray-light
;
background-color
:
$gray-light
;
color
:
darken
(
$gl-text-color-secondary
,
30%
)
;
color
:
$gl-text-color
;
.todos-pending-count
{
.todos-pending-count
{
background
:
darken
(
$todo-alert-blue
,
10%
);
background
:
darken
(
$todo-alert-blue
,
10%
);
...
...
app/assets/stylesheets/framework/variables.scss
浏览文件 @
272337e8
...
@@ -178,7 +178,7 @@ $count-arrow-border: #dce0e5;
...
@@ -178,7 +178,7 @@ $count-arrow-border: #dce0e5;
$save-project-loader-color
:
#555
;
$save-project-loader-color
:
#555
;
$divergence-graph-bar-bg
:
#ccc
;
$divergence-graph-bar-bg
:
#ccc
;
$divergence-graph-separator-bg
:
#ccc
;
$divergence-graph-separator-bg
:
#ccc
;
$general-hover-transition-duration
:
1
5
0ms
;
$general-hover-transition-duration
:
1
0
0ms
;
$general-hover-transition-curve
:
linear
;
$general-hover-transition-curve
:
linear
;
...
...
app/assets/stylesheets/pages/projects.scss
浏览文件 @
272337e8
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
margin
:
15px
5px
0
0
;
margin
:
15px
5px
0
0
;
input
{
input
{
height
:
2
7
px
;
height
:
2
8
px
;
}
}
}
}
...
@@ -523,7 +523,7 @@ a.deploy-project-label {
...
@@ -523,7 +523,7 @@ a.deploy-project-label {
&
:hover
,
&
:hover
,
&
:focus
{
&
:focus
{
color
:
darken
(
$notes-light-color
,
15%
)
;
color
:
$gl-text-color
;
}
}
}
}
...
...
app/views/projects/issues/index.html.haml
浏览文件 @
272337e8
...
@@ -19,10 +19,8 @@
...
@@ -19,10 +19,8 @@
=
render
'shared/issuable/nav'
,
type: :issues
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.nav-controls
-
if
current_user
-
if
current_user
=
link_to
url_for
(
params
.
merge
(
format: :atom
,
private_token:
current_user
.
private_token
)),
class:
'btn append-right-10'
do
=
link_to
url_for
(
params
.
merge
(
format: :atom
,
private_token:
current_user
.
private_token
)),
class:
'btn append-right-10
has-tooltip'
,
title:
'Subscribe
'
do
=
icon
(
'rss'
)
=
icon
(
'rss'
)
%span
.icon-label
Subscribe
-
if
can?
current_user
,
:create_issue
,
@project
-
if
can?
current_user
,
:create_issue
,
@project
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@project
,
...
...
spec/features/issues/filtered_search/filter_issues_spec.rb
浏览文件 @
272337e8
...
@@ -773,7 +773,7 @@ describe 'Filter issues', js: true, feature: true do
...
@@ -773,7 +773,7 @@ describe 'Filter issues', js: true, feature: true do
describe
'RSS feeds'
do
describe
'RSS feeds'
do
it
'updates atom feed link for project issues'
do
it
'updates atom feed link for project issues'
do
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
milestone_title:
milestone
.
title
,
assignee_id:
user
.
id
)
visit
namespace_project_issues_path
(
project
.
namespace
,
project
,
milestone_title:
milestone
.
title
,
assignee_id:
user
.
id
)
link
=
find
(
'.nav-controls a'
,
text:
'Subscribe'
)
link
=
find
_link
(
'Subscribe'
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
params
=
CGI
.
parse
(
URI
.
parse
(
link
[
:href
]).
query
)
auto_discovery_link
=
find
(
'link[type="application/atom+xml"]'
,
visible:
false
)
auto_discovery_link
=
find
(
'link[type="application/atom+xml"]'
,
visible:
false
)
auto_discovery_params
=
CGI
.
parse
(
URI
.
parse
(
auto_discovery_link
[
:href
]).
query
)
auto_discovery_params
=
CGI
.
parse
(
URI
.
parse
(
auto_discovery_link
[
:href
]).
query
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录