Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
86b752e0
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,发现更多精彩内容 >>
提交
86b752e0
编写于
4月 30, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'Soullivaneuh-container-class-reloaded'
上级
8d3eaf5f
ac5f9ff4
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
73 addition
and
80 deletion
+73
-80
app/assets/stylesheets/generic/header.scss
app/assets/stylesheets/generic/header.scss
+4
-6
app/assets/stylesheets/generic/mobile.scss
app/assets/stylesheets/generic/mobile.scss
+1
-1
app/assets/stylesheets/themes/gitlab-theme.scss
app/assets/stylesheets/themes/gitlab-theme.scss
+9
-11
app/views/layouts/_empty_head_panel.html.haml
app/views/layouts/_empty_head_panel.html.haml
+3
-4
app/views/layouts/_head_panel.html.haml
app/views/layouts/_head_panel.html.haml
+40
-41
app/views/layouts/_public_head_panel.html.haml
app/views/layouts/_public_head_panel.html.haml
+16
-17
未找到文件。
app/assets/stylesheets/generic/header.scss
浏览文件 @
86b752e0
...
...
@@ -10,7 +10,10 @@ header {
border
:
none
;
width
:
100%
;
.navbar-inner
{
.container
{
width
:
100%
!
important
;
padding
:
0
;
background
:
#FFF
;
border-bottom
:
1px
solid
#DDD
;
filter
:
none
;
...
...
@@ -123,11 +126,6 @@ header {
}
}
.container
{
width
:
100%
!
important
;
padding
:
0px
;
}
/**
*
* Logo holder
...
...
app/assets/stylesheets/generic/mobile.scss
浏览文件 @
86b752e0
...
...
@@ -56,7 +56,7 @@
}
}
.
navbar-in
ner
.title
{
.
contai
ner
.title
{
margin-left
:
6px
!
important
;
max-width
:
70%
!
important
;
}
...
...
app/assets/stylesheets/themes/gitlab-theme.scss
浏览文件 @
86b752e0
@mixin
gitlab-theme
(
$color-light
,
$color
,
$color-darker
,
$color-dark
)
{
header
{
&
.navbar-gitlab
{
.navbar-inner
{
.app_logo
{
background-color
:
$color-darker
;
.app_logo
{
background-color
:
$color-darker
;
a
{
color
:
$color-light
;
}
a
{
color
:
$color-light
;
}
&
:hover
{
background-color
:
$color-dark
;
a
{
color
:
#FFF
;
}
&
:hover
{
background-color
:
$color-dark
;
a
{
color
:
#FFF
;
}
}
}
...
...
app/views/layouts/_empty_head_panel.html.haml
浏览文件 @
86b752e0
%header
.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner
.container
%h4
.center
=
image_tag
'logo-white.png'
,
width:
32
,
height:
32
.container
%h4
.center
=
image_tag
'logo-white.png'
,
width:
32
,
height:
32
app/views/layouts/_head_panel.html.haml
浏览文件 @
86b752e0
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
.navbar-inner
.container
%div
.app_logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
brand_header_logo
%h3
GitLab
%h1
.title
=
title
.container
%div
.app_logo
=
link_to
root_path
,
class:
'home'
,
title:
'Dashboard'
,
id:
'js-shortcuts-home'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
brand_header_logo
%h3
GitLab
%h1
.title
=
title
%button
.navbar-toggle
{
type:
'button'
,
data:
{
target:
'.navbar-collapse'
,
toggle:
'collapse'
}}
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
%button
.navbar-toggle
{
type:
'button'
,
data:
{
target:
'.navbar-collapse'
,
toggle:
'collapse'
}}
%span
.sr-only
Toggle navigation
=
icon
(
'bars'
)
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%li
.hidden-sm.hidden-xs
=
render
'layouts/search'
%li
.visible-sm.visible-xs
=
link_to
search_path
,
title:
'Search'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'search'
)
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%li
.hidden-sm.hidden-xs
=
render
'layouts/search'
%li
.visible-sm.visible-xs
=
link_to
search_path
,
title:
'Search'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'search'
)
%li
=
link_to
help_path
,
title:
'Help'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'question-circle'
)
%li
=
link_to
explore_root_path
,
title:
'Explore'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'globe'
)
%li
=
link_to
user_snippets_path
(
current_user
),
title:
'Your snippets'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'clipboard'
)
-
if
current_user
.
is_admin?
%li
=
link_to
help_path
,
title:
'Help'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'question-circle'
)
=
link_to
admin_root_path
,
title:
'Admin area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'cogs'
)
-
if
current_user
.
can_create_project?
%li
=
link_to
explore_root_path
,
title:
'Explore'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'globe'
)
%li
=
link_to
user_snippets_path
(
current_user
),
title:
'Your snippets'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'clipboard'
)
-
if
current_user
.
is_admin?
%li
=
link_to
admin_root_path
,
title:
'Admin area'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'cogs'
)
-
if
current_user
.
can_create_project?
%li
=
link_to
new_project_path
,
title:
'New project'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'plus'
)
%li
=
link_to
profile_path
,
title:
'Profile settings'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'user'
)
%li
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'sign-out'
)
%li
.hidden-xs
=
link_to
current_user
,
class:
'profile-pic'
,
id:
'profile-pic'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
=
link_to
new_project_path
,
title:
'New project'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'plus'
)
%li
=
link_to
profile_path
,
title:
'Profile settings'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'user'
)
%li
=
link_to
destroy_user_session_path
,
class:
'logout'
,
method: :delete
,
title:
'Sign out'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
icon
(
'sign-out'
)
%li
.hidden-xs
=
link_to
current_user
,
class:
'profile-pic'
,
id:
'profile-pic'
,
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
}
do
=
image_tag
avatar_icon
(
current_user
.
email
,
60
),
alt:
'User activity'
=
render
'shared/outdated_browser'
app/views/layouts/_public_head_panel.html.haml
浏览文件 @
86b752e0
%header
.navbar.navbar-fixed-top.navbar-gitlab
{
class:
nav_header_class
}
.navbar-inner
.container
%div
.app_logo
=
link_to
explore_root_path
,
class:
"home"
do
=
brand_header_logo
%h3
GitLab
%h1
.title
=
title
.container
%div
.app_logo
=
link_to
explore_root_path
,
class:
"home"
do
=
brand_header_logo
%h3
GitLab
%h1
.title
=
title
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
%span
.sr-only
Toggle navigation
%i
.fa.fa-bars
%button
.navbar-toggle
{
"data-target"
=>
".navbar-collapse"
,
"data-toggle"
=>
"collapse"
,
type:
"button"
}
%span
.sr-only
Toggle navigation
%i
.fa.fa-bars
-
unless
current_controller?
(
'sessions'
)
.pull-right.hidden-xs
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-new append-right-10'
-
unless
current_controller?
(
'sessions'
)
.pull-right.hidden-xs
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
),
class:
'btn btn-sign-in btn-new append-right-10'
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%li
.visible-xs
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
)
.navbar-collapse.collapse
%ul
.nav.navbar-nav
%li
.visible-xs
=
link_to
"Sign in"
,
new_session_path
(
:user
,
redirect_to_referer:
'yes'
)
=
render
'shared/outdated_browser'
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录