Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
fb6d4511
Commit
fb6d4511
authored
Apr 12, 2012
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restored dark theme
parent
0e62b1cb
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
56 deletions
+14
-56
app/assets/images/logo_basic.png
app/assets/images/logo_basic.png
+0
-0
app/assets/images/logo_mars.png
app/assets/images/logo_mars.png
+0
-0
app/assets/images/logo_wh.png
app/assets/images/logo_wh.png
+0
-0
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_basic.scss
+1
-1
app/assets/stylesheets/ui_mars.scss
app/assets/stylesheets/ui_mars.scss
+11
-53
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+1
-1
app/views/profile/design.html.haml
app/views/profile/design.html.haml
+1
-1
No files found.
app/assets/images/logo_
tr
.png
→
app/assets/images/logo_
basic
.png
View file @
fb6d4511
File moved
app/assets/images/logo_mars.png
0 → 100644
View file @
fb6d4511
2.18 KB
app/assets/images/logo_wh.png
deleted
100644 → 0
View file @
0e62b1cb
2.01 KB
app/assets/stylesheets/ui_basic.scss
View file @
fb6d4511
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
float
:left
;
float
:left
;
h1
{
h1
{
background
:
url('logo_
tr
.png')
no-repeat
-3px
-4px
;
background
:
url('logo_
basic
.png')
no-repeat
-3px
-4px
;
float
:left
;
float
:left
;
margin-left
:
5px
;
margin-left
:
5px
;
font-size
:
20px
;
font-size
:
20px
;
...
...
app/assets/stylesheets/ui_mars.scss
View file @
fb6d4511
...
@@ -9,41 +9,6 @@
...
@@ -9,41 +9,6 @@
*
*
*/
*/
.ui_mars
{
.ui_mars
{
background
:
#eee
;
.container
{
border
:
1px
solid
rgba
(
0
,
0
,
0
,.
22
);
box-shadow
:
0
0
0px
4px
rgba
(
0
,
0
,
0
,.
04
);
background
:white
;
margin-top
:
20px
;
min-height
:
500px
;
nav
.main_menu
{
margin
:
0
;
margin-bottom
:
20px
;
border
:none
;
border-bottom
:
1px
solid
#bbb
;
border-radius
:
0
;
a
{
border-radius
:
0
;
}
}
}
/*
* Common styles
*
*/
a
{
color
:
$link_color
;
&
:hover
{
text-decoration
:none
;
color
:
$style_color
;
}
}
/*
/*
* Application Header
* Application Header
...
@@ -55,10 +20,7 @@
...
@@ -55,10 +20,7 @@
margin
:
0
;
margin
:
0
;
top
:
1px
;
top
:
1px
;
left
:
0
;
left
:
0
;
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
background
:
#474D57
url('bg-header.png')
repeat-x
bottom
;
z-index
:
10
;
z-index
:
10
;
height
:
60px
;
height
:
60px
;
...
@@ -99,31 +61,19 @@
...
@@ -99,31 +61,19 @@
float
:left
;
float
:left
;
h1
{
h1
{
background
:
url('logo_
wh
.png')
no-repeat
-3px
-4px
;
background
:
url('logo_
mars
.png')
no-repeat
-3px
-4px
;
float
:left
;
float
:left
;
margin-left
:
5px
;
margin-left
:
5px
;
font-size
:
20px
;
font-size
:
20px
;
line-height
:
36px
;
line-height
:
36px
;
font-weight
:
bold
;
font-weight
:
normal
;
color
:
#
ccc
;
color
:
#
a1a8ae
;
text-shadow
:
0
1px
1px
#111
;
text-shadow
:
0
1px
1px
#111
;
padding-left
:
50px
;
padding-left
:
50px
;
padding-top
:
5px
;
padding-top
:
5px
;
}
}
}
}
}
}
.wrapper
{
margin
:auto
;
min-width
:
$min_app_width
;
max-width
:
$max_app_width
;
position
:relative
;
padding
:
15px
0
;
.account-box
img
{
right
:
0
;
}
}
.project_name
{
.project_name
{
float
:left
;
float
:left
;
width
:
360px
;
width
:
360px
;
...
@@ -136,6 +86,14 @@
...
@@ -136,6 +86,14 @@
text-shadow
:
0
1px
1px
#111
;
text-shadow
:
0
1px
1px
#111
;
}
}
.container
{
.top_panel_content
{
margin
:auto
;
position
:relative
;
padding
:
15px
0
;
}
}
.admin_link
{
.admin_link
{
width
:
16px
;
width
:
16px
;
height
:
16px
;
height
:
16px
;
...
...
app/helpers/application_helper.rb
View file @
fb6d4511
...
@@ -123,7 +123,7 @@ module ApplicationHelper
...
@@ -123,7 +123,7 @@ module ApplicationHelper
end
end
def
app_theme
def
app_theme
if
true
#
current_user && current_user.theme_id == 1
if
current_user
&&
current_user
.
theme_id
==
1
"ui_basic"
"ui_basic"
else
else
"ui_mars"
"ui_mars"
...
...
app/views/profile/design.html.haml
View file @
fb6d4511
=
form_for
@user
,
:url
=>
profile_update_path
,
:remote
=>
true
,
:method
=>
:put
do
|
f
|
=
form_for
@user
,
:url
=>
profile_update_path
,
:remote
=>
true
,
:method
=>
:put
do
|
f
|
-#
%div
%div
%h3
Application theme
%h3
Application theme
%hr
%hr
.clearfix
.clearfix
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment