Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f6ac9528
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,发现更多精彩内容 >>
提交
f6ac9528
编写于
2月 17, 2017
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'global-dropdown-edits' into 'master'
Global dropdown edits See merge request !9336
上级
721ae6be
ee444bf3
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
10 addition
and
26 deletion
+10
-26
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+6
-8
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+2
-2
app/views/profiles/preferences/show.html.haml
app/views/profiles/preferences/show.html.haml
+0
-7
doc/profile/preferences.md
doc/profile/preferences.md
+0
-7
spec/features/dashboard/issuables_counter_spec.rb
spec/features/dashboard/issuables_counter_spec.rb
+2
-2
未找到文件。
app/assets/stylesheets/framework/header.scss
浏览文件 @
f6ac9528
...
@@ -111,15 +111,9 @@ header {
...
@@ -111,15 +111,9 @@ header {
}
}
li
{
li
{
.active
a
{
&
.active
a
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
&
:hover
{
.badge
{
background-color
:
$white-light
;
}
}
}
}
}
}
...
@@ -132,7 +126,11 @@ header {
...
@@ -132,7 +126,11 @@ header {
&
:hover
{
&
:hover
{
background-color
:
$white-normal
;
background-color
:
$white-normal
;
color
:
$gl-header-nav-hover-color
;
}
&
:focus
{
outline
:
none
;
background-color
:
$white-normal
;
}
}
}
}
...
...
app/views/layouts/nav/_dashboard.html.haml
浏览文件 @
f6ac9528
...
@@ -24,12 +24,12 @@
...
@@ -24,12 +24,12 @@
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
=
link_to
assigned_issues_dashboard_path
,
title:
'Issues'
,
class:
'dashboard-shortcuts-issues'
do
%span
%span
Issues
Issues
%span
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
)
)
(
#{
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:issues
,
:opened
))
}
)
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
=
link_to
assigned_mrs_dashboard_path
,
title:
'Merge Requests'
,
class:
'dashboard-shortcuts-merge_requests'
do
%span
%span
Merge Requests
Merge Requests
%span
.badge
=
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
)
)
(
#{
number_with_delimiter
(
cached_assigned_issuables_count
(
current_user
,
:merge_requests
,
:opened
))
}
)
=
nav_link
(
controller:
'dashboard/snippets'
)
do
=
nav_link
(
controller:
'dashboard/snippets'
)
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
=
link_to
dashboard_snippets_path
,
title:
'Snippets'
do
%span
%span
...
...
app/views/profiles/preferences/show.html.haml
浏览文件 @
f6ac9528
...
@@ -2,13 +2,6 @@
...
@@ -2,13 +2,6 @@
=
render
'profiles/head'
=
render
'profiles/head'
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
=
form_for
@user
,
url:
profile_preferences_path
,
remote:
true
,
method: :put
,
html:
{
class:
'row prepend-top-default js-preferences-form'
}
do
|
f
|
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0
Application theme
%p
This setting allows you to customize the appearance of the site, e.g. the sidebar.
.col-sm-12
%hr
.col-lg-3.profile-settings-sidebar
.col-lg-3.profile-settings-sidebar
%h4
.prepend-top-0
%h4
.prepend-top-0
Syntax highlighting theme
Syntax highlighting theme
...
...
doc/profile/preferences.md
浏览文件 @
f6ac9528
...
@@ -3,13 +3,6 @@
...
@@ -3,13 +3,6 @@
Settings in the
**Profile > Preferences**
page allow the user to customize
Settings in the
**Profile > Preferences**
page allow the user to customize
various aspects of the site to their liking.
various aspects of the site to their liking.
## Application theme
Changing this setting allows the user to customize the color scheme used for the
navigation bar on the left side of the screen.
The default is
**Charcoal**
.
## Syntax highlighting theme
## Syntax highlighting theme
_GitLab uses the
[
rouge ruby library
][
rouge
]
for syntax highlighting. For a
_GitLab uses the
[
rouge ruby library
][
rouge
]
for syntax highlighting. For a
...
...
spec/features/dashboard/issuables_counter_spec.rb
浏览文件 @
f6ac9528
...
@@ -35,9 +35,9 @@ describe 'Navigation bar counter', feature: true, js: true, caching: true do
...
@@ -35,9 +35,9 @@ describe 'Navigation bar counter', feature: true, js: true, caching: true do
end
end
def
expect_counters
(
issuable_type
,
count
)
def
expect_counters
(
issuable_type
,
count
)
dashboard_count
=
find
(
'li.active
span.badge
'
)
dashboard_count
=
find
(
'li.active'
)
find
(
'.global-dropdown-toggle'
).
click
find
(
'.global-dropdown-toggle'
).
click
nav_count
=
find
(
".dashboard-shortcuts-
#{
issuable_type
}
span.badge
"
)
nav_count
=
find
(
".dashboard-shortcuts-
#{
issuable_type
}
"
)
expect
(
nav_count
).
to
have_content
(
count
)
expect
(
nav_count
).
to
have_content
(
count
)
expect
(
dashboard_count
).
to
have_content
(
count
)
expect
(
dashboard_count
).
to
have_content
(
count
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录