restored dark theme

Dmitriy Zaporozhets
1 parent 0e62b1cb
Showing 8 changed files with 14 additions and 56 deletions Show diff stats
app/assets/images/logo_basic.png
app/assets/images/logo_mars.png
app/assets/images/logo_tr.png
app/assets/images/logo_wh.png
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_mars.scss
app/helpers/application_helper.rb
app/views/profile/design.html.haml
@@ -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"
 = form_for @user, :url => profile_update_path, :remote => true, :method => :put do |f|
-  -#%div
+  %div
     %h3 Application theme
     %hr
     .clearfix
...	...	@@ -50,7 +50,7 @@
50	50	float:left;
51	51
52	52	h1 {
53		- background: url('logo_tr.png') no-repeat -3px -4px;
	53	+ background: url('logo_basic.png') no-repeat -3px -4px;
54	54	float:left;
55	55	margin-left:5px;
56	56	font-size:20px;
...	...
...	...	@@ -9,41 +9,6 @@
9	9	*
10	10	*/
11	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	14	* Application Header
...	...	@@ -55,10 +20,7 @@
55	20	margin:0;
56	21	top:1px;
57	22	left:0;
58		-
59		-
60	23	background: #474D57 url('bg-header.png') repeat-x bottom;
61		-
62	24	z-index:10;
63	25	height:60px;
64	26
...	...	@@ -99,31 +61,19 @@
99	61	float:left;
100	62
101	63	h1 {
102		- background: url('logo_wh.png') no-repeat -3px -4px;
	64	+ background: url('logo_mars.png') no-repeat -3px -4px;
103	65	float:left;
104	66	margin-left:5px;
105	67	font-size:20px;
106	68	line-height:36px;
107		- font-weight:bold;
108		- color:#ccc;
	69	+ font-weight:normal;
	70	+ color:#a1a8ae;
109	71	text-shadow: 0 1px 1px #111;
110	72	padding-left:50px;
111	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	77	.project_name {
128	78	float:left;
129	79	width:360px;
...	...	@@ -136,6 +86,14 @@
136	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	97	.admin_link {
140	98	width: 16px;
141	99	height: 16px;
...	...
...	...	@@ -123,7 +123,7 @@ module ApplicationHelper
123	123	end
124	124
125	125	def app_theme
126		- if true#current_user && current_user.theme_id == 1
	126	+ if current_user && current_user.theme_id == 1
127	127	"ui_basic"
128	128	else
129	129	"ui_mars"
...	...
1	1	= form_for @user, :url => profile_update_path, :remote => true, :method => :put do \|f\|
2		- -#%div
	2	+ %div
3	3	%h3 Application theme
4	4	%hr
5	5	.clearfix
...	...