restored dark theme
This commit is contained in:
parent
0e62b1cbaa
commit
fb6d4511a0
7 changed files with 14 additions and 56 deletions
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
BIN
app/assets/images/logo_mars.png
Normal file
BIN
app/assets/images/logo_mars.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2 KiB |
|
@ -50,7 +50,7 @@
|
|||
float:left;
|
||||
|
||||
h1 {
|
||||
background: url('logo_tr.png') no-repeat -3px -4px;
|
||||
background: url('logo_basic.png') no-repeat -3px -4px;
|
||||
float:left;
|
||||
margin-left:5px;
|
||||
font-size:20px;
|
||||
|
|
|
@ -9,41 +9,6 @@
|
|||
*
|
||||
*/
|
||||
.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
|
||||
|
@ -55,10 +20,7 @@
|
|||
margin:0;
|
||||
top:1px;
|
||||
left:0;
|
||||
|
||||
|
||||
background: #474D57 url('bg-header.png') repeat-x bottom;
|
||||
|
||||
z-index:10;
|
||||
height:60px;
|
||||
|
||||
|
@ -99,31 +61,19 @@
|
|||
float:left;
|
||||
|
||||
h1 {
|
||||
background: url('logo_wh.png') no-repeat -3px -4px;
|
||||
background: url('logo_mars.png') no-repeat -3px -4px;
|
||||
float:left;
|
||||
margin-left:5px;
|
||||
font-size:20px;
|
||||
line-height:36px;
|
||||
font-weight:bold;
|
||||
color:#ccc;
|
||||
font-weight:normal;
|
||||
color:#a1a8ae;
|
||||
text-shadow: 0 1px 1px #111;
|
||||
padding-left:50px;
|
||||
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 {
|
||||
float:left;
|
||||
width:360px;
|
||||
|
@ -136,6 +86,14 @@
|
|||
text-shadow: 0 1px 1px #111;
|
||||
}
|
||||
|
||||
.container {
|
||||
.top_panel_content {
|
||||
margin:auto;
|
||||
position:relative;
|
||||
padding:15px 0;
|
||||
}
|
||||
}
|
||||
|
||||
.admin_link {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
|
|
|
@ -123,7 +123,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def app_theme
|
||||
if true#current_user && current_user.theme_id == 1
|
||||
if current_user && current_user.theme_id == 1
|
||||
"ui_basic"
|
||||
else
|
||||
"ui_mars"
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
= form_for @user, :url => profile_update_path, :remote => true, :method => :put do |f|
|
||||
-#%div
|
||||
%div
|
||||
%h3 Application theme
|
||||
%hr
|
||||
.clearfix
|
||||
|
|
Loading…
Reference in a new issue