Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
04bf40a9
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,体验更适合开发者的 AI 搜索 >>
提交
04bf40a9
编写于
6月 11, 2012
作者:
R
randx
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactored theme css, added Modern theme pre version
上级
a6dad85d
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
172 addition
and
11 deletion
+172
-11
app/assets/images/logo_text_tr.png
app/assets/images/logo_text_tr.png
+0
-0
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/gitlab_bootstrap.scss
+1
-1
app/assets/stylesheets/main.scss
app/assets/stylesheets/main.scss
+7
-2
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_basic.scss
+0
-0
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_mars.scss
+0
-0
app/assets/stylesheets/themes/ui_modern.scss
app/assets/stylesheets/themes/ui_modern.scss
+143
-0
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-6
app/views/profile/design.html.haml
app/views/profile/design.html.haml
+4
-0
app/views/refs/_tree_file.html.haml
app/views/refs/_tree_file.html.haml
+1
-2
lib/gitlab/theme.rb
lib/gitlab/theme.rb
+15
-0
未找到文件。
app/assets/images/logo_text_tr.png
0 → 100644
浏览文件 @
04bf40a9
3.2 KB
app/assets/stylesheets/gitlab_bootstrap.scss
浏览文件 @
04bf40a9
...
...
@@ -403,7 +403,7 @@ form {
margin-bottom
:
40px
;
@include
round-borders-all
(
4px
);
@include
shade
;
border-color
:
#
CCC
;
border-color
:
#
DDD
;
ul
{
margin
:
0
;
...
...
app/assets/stylesheets/main.scss
浏览文件 @
04bf40a9
...
...
@@ -74,12 +74,17 @@ $hover: #FDF5D9;
* - main menu styles
*
*/
@import
"ui_basic.scss"
;
@import
"
themes/
ui_basic.scss"
;
/**
* UI mars theme
*/
@import
"ui_mars.scss"
;
@import
"themes/ui_mars.scss"
;
/**
* UI Modern theme
*/
@import
"themes/ui_modern.scss"
;
/**
* Gitlab bootstrap.
...
...
app/assets/stylesheets/ui_basic.scss
→
app/assets/stylesheets/
themes/
ui_basic.scss
浏览文件 @
04bf40a9
文件已移动
app/assets/stylesheets/ui_mars.scss
→
app/assets/stylesheets/
themes/
ui_mars.scss
浏览文件 @
04bf40a9
文件已移动
app/assets/stylesheets/themes/ui_modern.scss
0 → 100644
浏览文件 @
04bf40a9
/**
* This file represent some UI that can be changed
* during web app restyle or theme select.
*
* Next items should be placed there
* - link colors
* - header styles
* - main menu styles
*
*/
.ui_modern
{
background
:
#eee
;
>
.container
{
background
:
#FFF
;
border
:
1px
solid
#ccc
;
padding
:
20px
;
margin-top
:
30px
;
-moz-box-shadow
:
0
0
1px
1px
#E3E3E3
;
-webkit-box-shadow
:
0
0
1px
1px
#E3E3E3
;
box-shadow
:
0
0
1px
1px
#E3E3E3
;
}
nav
.main_menu
{
position
:
absolute
;
width
:
100%
;
left
:
0
;
top
:
35px
;
@include
border-radius
(
0px
);
a
.current
{
border-bottom
:none
;
}
}
.commit-box
,
.issue_form_box
{
margin-top
:
0px
;
}
.ui-box
{
@include
border-radius
(
0px
);
}
/*
* Common styles
*
*/
a
{
color
:
$link_color
;
&
:hover
{
text-decoration
:none
;
color
:
$blue_link
;
}
}
/*
* Application Header
*
*/
header
{
width
:
100%
;
padding
:
0
;
margin
:
0
;
top
:
1px
;
left
:
0
;
background
:
#FFF
;
/* for non-css3 browsers */
z-index
:
10
;
height
:
100px
;
.app_logo
{
float
:left
;
position
:relative
;
top
:
-5px
;
a
{
float
:left
;
h1
{
left
:
-30px
;
position
:
relative
;
text-indent
:
-9999px
;
width
:
112px
;
background
:
url('logo_text_tr.png')
no-repeat
0px
0
;
float
:left
;
font-size
:
20px
;
line-height
:
36px
;
font-weight
:bold
;
color
:
#aaa
;
text-shadow
:
0
1px
1px
#FFF
;
padding-left
:
50px
;
}
}
}
.container
{
.top_panel_content
{
margin
:auto
;
position
:relative
;
padding
:
15px
0
;
}
}
.project_name
{
float
:left
;
margin
:
0
;
margin-right
:
30px
;
font-size
:
20px
;
line-height
:
36px
;
font-weight
:bold
;
color
:
$style_color
;
text-shadow
:
0
1px
1px
#FFF
;
}
.fbtn
{
float
:
right
;
margin-right
:
10px
;
.btn
{
margin-left
:
8px
;
}
}
.search
{
float
:
right
;
margin-right
:
55px
;
.search-input
{
width
:
130px
;
background-image
:
url("icon-search.png")
;
background-repeat
:
no-repeat
;
background-position
:
10px
;
padding-left
:
25px
;
@include
border-radius
(
5px
);
border
:
1px
solid
#ccc
;
}
}
}
/*
* End of Application Header
*
*/
}
app/helpers/application_helper.rb
浏览文件 @
04bf40a9
...
...
@@ -85,11 +85,6 @@ module ApplicationHelper
end
def
app_theme
if
current_user
&&
current_user
.
theme_id
==
1
"ui_basic"
else
"ui_mars"
end
Gitlab
::
Theme
.
css_class_by_id
(
current_user
.
try
(
:theme_id
))
end
end
app/views/profile/design.html.haml
浏览文件 @
04bf40a9
...
...
@@ -10,6 +10,10 @@
=
label_tag
do
=
f
.
radio_button
:theme_id
,
2
Classic
=
label_tag
do
=
f
.
radio_button
:theme_id
,
3
Modern
%br
%h3
Code review
%hr
...
...
app/views/refs/_tree_file.html.haml
浏览文件 @
04bf40a9
...
...
@@ -21,8 +21,7 @@
=
preserve
do
=
raw
file
.
colorize
(
options:
{
linenos:
'True'
})
-
else
%h3
%center
Empty file
%h4
.nothing_here_message
Empty file
-
elsif
file
.
image?
.view_file_content_image
%img
{
:src
=>
"data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"
}
...
...
lib/gitlab/theme.rb
0 → 100644
浏览文件 @
04bf40a9
module
Gitlab
class
Theme
def
self
.
css_class_by_id
(
id
)
themes
=
{
1
=>
"ui_basic"
,
2
=>
"ui_mars"
,
3
=>
"ui_modern"
}
id
||=
1
return
themes
[
id
]
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录