From fb6d4511a05112677e0279ed87a55d3f02e2d49c Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Thu, 12 Apr 2012 00:54:07 +0300 Subject: [PATCH] restored dark theme --- .../images/{logo_tr.png => logo_basic.png} | Bin app/assets/images/logo_mars.png | Bin 0 -> 2228 bytes app/assets/images/logo_wh.png | Bin 2056 -> 0 bytes app/assets/stylesheets/ui_basic.scss | 2 +- app/assets/stylesheets/ui_mars.scss | 64 +++--------------- app/helpers/application_helper.rb | 2 +- app/views/profile/design.html.haml | 2 +- 7 files changed, 14 insertions(+), 56 deletions(-) rename app/assets/images/{logo_tr.png => logo_basic.png} (100%) create mode 100644 app/assets/images/logo_mars.png delete mode 100644 app/assets/images/logo_wh.png diff --git a/app/assets/images/logo_tr.png b/app/assets/images/logo_basic.png similarity index 100% rename from app/assets/images/logo_tr.png rename to app/assets/images/logo_basic.png diff --git a/app/assets/images/logo_mars.png b/app/assets/images/logo_mars.png new file mode 100644 index 0000000000000000000000000000000000000000..1270700e909e0425038a2456ef514db46bafa49f GIT binary patch literal 2228 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 diff --git a/app/assets/stylesheets/ui_basic.scss b/app/assets/stylesheets/ui_basic.scss index cd6b0e13..fc4a108c 100644 --- a/app/assets/stylesheets/ui_basic.scss +++ b/app/assets/stylesheets/ui_basic.scss @@ -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; diff --git a/app/assets/stylesheets/ui_mars.scss b/app/assets/stylesheets/ui_mars.scss index 1178c189..d61df9a5 100644 --- a/app/assets/stylesheets/ui_mars.scss +++ b/app/assets/stylesheets/ui_mars.scss @@ -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; diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ca4555c2..0edd3125 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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" diff --git a/app/views/profile/design.html.haml b/app/views/profile/design.html.haml index 85f3d0ca..a4b40d03 100644 --- a/app/views/profile/design.html.haml +++ b/app/views/profile/design.html.haml @@ -1,5 +1,5 @@ = form_for @user, :url => profile_update_path, :remote => true, :method => :put do |f| - -#%div + %div %h3 Application theme %hr .clearfix