Commit fb6d4511a05112677e0279ed87a55d3f02e2d49c
1 parent
0e62b1cb
Exists in
master
and in
4 other branches
restored dark theme
Showing
8 changed files
with
14 additions
and
56 deletions
Show diff stats
3.2 KB
2.18 KB
app/assets/images/logo_tr.png
3.2 KB
app/assets/images/logo_wh.png
2.01 KB
app/assets/stylesheets/ui_basic.scss
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | float:left; | 50 | float:left; |
| 51 | 51 | ||
| 52 | h1 { | 52 | h1 { |
| 53 | - background: url('logo_tr.png') no-repeat -3px -4px; | 53 | + background: url('logo_basic.png') no-repeat -3px -4px; |
| 54 | float:left; | 54 | float:left; |
| 55 | margin-left:5px; | 55 | margin-left:5px; |
| 56 | font-size:20px; | 56 | font-size:20px; |
app/assets/stylesheets/ui_mars.scss
| @@ -9,41 +9,6 @@ | @@ -9,41 +9,6 @@ | ||
| 9 | * | 9 | * |
| 10 | */ | 10 | */ |
| 11 | .ui_mars { | 11 | .ui_mars { |
| 12 | - background:#eee; | ||
| 13 | - | ||
| 14 | - .container { | ||
| 15 | - border: 1px solid rgba(0,0,0,.22); | ||
| 16 | - box-shadow: 0 0 0px 4px rgba(0,0,0,.04); | ||
| 17 | - background:white; | ||
| 18 | - margin-top:20px; | ||
| 19 | - min-height:500px; | ||
| 20 | - | ||
| 21 | - nav.main_menu { | ||
| 22 | - margin:0; | ||
| 23 | - margin-bottom: 20px; | ||
| 24 | - border:none; | ||
| 25 | - border-bottom: 1px solid #bbb; | ||
| 26 | - border-radius:0; | ||
| 27 | - | ||
| 28 | - a { | ||
| 29 | - border-radius:0; | ||
| 30 | - } | ||
| 31 | - } | ||
| 32 | - } | ||
| 33 | - | ||
| 34 | - | ||
| 35 | - /* | ||
| 36 | - * Common styles | ||
| 37 | - * | ||
| 38 | - */ | ||
| 39 | - a { | ||
| 40 | - color: $link_color; | ||
| 41 | - &:hover { | ||
| 42 | - text-decoration:none; | ||
| 43 | - color: $style_color; | ||
| 44 | - } | ||
| 45 | - } | ||
| 46 | - | ||
| 47 | 12 | ||
| 48 | /* | 13 | /* |
| 49 | * Application Header | 14 | * Application Header |
| @@ -55,10 +20,7 @@ | @@ -55,10 +20,7 @@ | ||
| 55 | margin:0; | 20 | margin:0; |
| 56 | top:1px; | 21 | top:1px; |
| 57 | left:0; | 22 | left:0; |
| 58 | - | ||
| 59 | - | ||
| 60 | background: #474D57 url('bg-header.png') repeat-x bottom; | 23 | background: #474D57 url('bg-header.png') repeat-x bottom; |
| 61 | - | ||
| 62 | z-index:10; | 24 | z-index:10; |
| 63 | height:60px; | 25 | height:60px; |
| 64 | 26 | ||
| @@ -99,31 +61,19 @@ | @@ -99,31 +61,19 @@ | ||
| 99 | float:left; | 61 | float:left; |
| 100 | 62 | ||
| 101 | h1 { | 63 | h1 { |
| 102 | - background: url('logo_wh.png') no-repeat -3px -4px; | 64 | + background: url('logo_mars.png') no-repeat -3px -4px; |
| 103 | float:left; | 65 | float:left; |
| 104 | margin-left:5px; | 66 | margin-left:5px; |
| 105 | font-size:20px; | 67 | font-size:20px; |
| 106 | line-height:36px; | 68 | line-height:36px; |
| 107 | - font-weight:bold; | ||
| 108 | - color:#ccc; | 69 | + font-weight:normal; |
| 70 | + color:#a1a8ae; | ||
| 109 | text-shadow: 0 1px 1px #111; | 71 | text-shadow: 0 1px 1px #111; |
| 110 | padding-left:50px; | 72 | padding-left:50px; |
| 111 | padding-top:5px; | 73 | padding-top:5px; |
| 112 | } | 74 | } |
| 113 | } | 75 | } |
| 114 | } | 76 | } |
| 115 | - .wrapper { | ||
| 116 | - margin:auto; | ||
| 117 | - min-width:$min_app_width; | ||
| 118 | - max-width:$max_app_width; | ||
| 119 | - position:relative; | ||
| 120 | - padding:15px 0; | ||
| 121 | - | ||
| 122 | - .account-box img { | ||
| 123 | - right:0; | ||
| 124 | - } | ||
| 125 | - } | ||
| 126 | - | ||
| 127 | .project_name { | 77 | .project_name { |
| 128 | float:left; | 78 | float:left; |
| 129 | width:360px; | 79 | width:360px; |
| @@ -136,6 +86,14 @@ | @@ -136,6 +86,14 @@ | ||
| 136 | text-shadow: 0 1px 1px #111; | 86 | text-shadow: 0 1px 1px #111; |
| 137 | } | 87 | } |
| 138 | 88 | ||
| 89 | + .container { | ||
| 90 | + .top_panel_content { | ||
| 91 | + margin:auto; | ||
| 92 | + position:relative; | ||
| 93 | + padding:15px 0; | ||
| 94 | + } | ||
| 95 | + } | ||
| 96 | + | ||
| 139 | .admin_link { | 97 | .admin_link { |
| 140 | width: 16px; | 98 | width: 16px; |
| 141 | height: 16px; | 99 | height: 16px; |
app/helpers/application_helper.rb
| @@ -123,7 +123,7 @@ module ApplicationHelper | @@ -123,7 +123,7 @@ module ApplicationHelper | ||
| 123 | end | 123 | end |
| 124 | 124 | ||
| 125 | def app_theme | 125 | def app_theme |
| 126 | - if true#current_user && current_user.theme_id == 1 | 126 | + if current_user && current_user.theme_id == 1 |
| 127 | "ui_basic" | 127 | "ui_basic" |
| 128 | else | 128 | else |
| 129 | "ui_mars" | 129 | "ui_mars" |
app/views/profile/design.html.haml