Work on themes a bit

Dmitriy Zaporozhets
1 parent ee890f2b
Showing 9 changed files with 26 additions and 25 deletions Show diff stats
app/assets/stylesheets/sections/header.scss
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/themes.scss
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_color.scss
app/assets/stylesheets/themes/ui_gray.scss
app/assets/stylesheets/themes/ui_mars.scss
app/assets/stylesheets/themes/ui_modern.scss
app/views/profiles/design.html.haml
@@ -120,7 +120,7 @@ header {
         border-bottom: 1px solid #AAA;
  
         .nav > li > a {
-          color: #DDD;
+          color: #AAA;
           text-shadow: 0 1px 0 #444;
  
           &:hover {
@@ -130,6 +130,10 @@ header {
       }
     }
  
+    .turbolink-spinner {
+      color: #FFF;
+    }
+
     .search {
       .search-input {
         background-color: #D2D5DA;
 .main-nav {
+  background: #f5f5f5;
   margin: 30px 0;
   margin-top: 0;
   padding-top: 4px;
@@ -27,15 +27,15 @@
       }
  
       &.modern {
-        background: #567;
+        background: #345;
       }
  
       &.gray {
-        background: #708090;
+        background: #373737;
       }
  
       &.violet {
-        background: #657;
+        background: #547;
       }
     }
   }
@@ -8,4 +8,8 @@
     background: #F9F9F9;
     border-left: 1px solid #DDD;
   }
+
+  .main-nav {
+    background: #FFF;
+  }
 }
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #657;
+        background: #547;
         .app_logo {
           &:hover {
-            background-color: #6A5A7A;
+            background-color: #435;
           }
         }
         .separator {
-          background: #546;
-          border-left: 1px solid #706080;
+          background: #435;
+          border-left: 1px solid #658;
         }
       }
     }
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #708090;
+        background: #373737;
         .app_logo {
           &:hover {
-            background-color: #6A7A8A;
+            background-color: #272727;
           }
         }
         .separator {
-          background: #607080;
-          border-left: 1px solid #8090A0;
+          background: #272727;
+          border-left: 1px solid #474747;
         }
       }
     }
@@ -23,20 +23,12 @@
             background-color: #373D47;
           }
         }
-        .nav > li > a { color: #AAA; }
       }
     }
-    .turbolink-spinner {
-      color: #FFF;
-    }
  
     .separator {
       background: #31363E;
       border-left: 1px solid #666;
     }
   }
-
-  .main-nav {
-    background: #f5f5f5;
-  }
 }
@@ -16,15 +16,15 @@
     @extend .header-dark;
     &.navbar-gitlab {
       .navbar-inner {
-        background: #567;
+        background: #345;
         .app_logo {
           &:hover {
-            background-color: #516171;
+            background-color: #234;
           }
         }
         .separator {
-          background: #456;
-          border-left: 1px solid #678;
+          background: #234;
+          border-left: 1px solid #456;
         }
       }
     }
@@ -24,7 +24,7 @@
       = label_tag do
         .prev.gray
         = f.radio_button :theme_id, 4
-        SlateGray
+        Gray
  
       = label_tag do
         .prev.violet
...	...	@@ -120,7 +120,7 @@ header {
120	120	border-bottom: 1px solid #AAA;
121	121
122	122	.nav > li > a {
123		- color: #DDD;
	123	+ color: #AAA;
124	124	text-shadow: 0 1px 0 #444;
125	125
126	126	&:hover {
...	...	@@ -130,6 +130,10 @@ header {
130	130	}
131	131	}
132	132
	133	+ .turbolink-spinner {
	134	+ color: #FFF;
	135	+ }
	136	+
133	137	.search {
134	138	.search-input {
135	139	background-color: #D2D5DA;
...	...
1	1	.main-nav {
	2	+ background: #f5f5f5;
2	3	margin: 30px 0;
3	4	margin-top: 0;
4	5	padding-top: 4px;
...	...
...	...	@@ -27,15 +27,15 @@
27	27	}
28	28
29	29	&.modern {
30		- background: #567;
	30	+ background: #345;
31	31	}
32	32
33	33	&.gray {
34		- background: #708090;
	34	+ background: #373737;
35	35	}
36	36
37	37	&.violet {
38		- background: #657;
	38	+ background: #547;
39	39	}
40	40	}
41	41	}
...	...
...	...	@@ -8,4 +8,8 @@
8	8	background: #F9F9F9;
9	9	border-left: 1px solid #DDD;
10	10	}
	11	+
	12	+ .main-nav {
	13	+ background: #FFF;
	14	+ }
11	15	}
...	...
...	...	@@ -16,15 +16,15 @@
16	16	@extend .header-dark;
17	17	&.navbar-gitlab {
18	18	.navbar-inner {
19		- background: #657;
	19	+ background: #547;
20	20	.app_logo {
21	21	&:hover {
22		- background-color: #6A5A7A;
	22	+ background-color: #435;
23	23	}
24	24	}
25	25	.separator {
26		- background: #546;
27		- border-left: 1px solid #706080;
	26	+ background: #435;
	27	+ border-left: 1px solid #658;
28	28	}
29	29	}
30	30	}
...	...
...	...	@@ -23,20 +23,12 @@
23	23	background-color: #373D47;
24	24	}
25	25	}
26		- .nav > li > a { color: #AAA; }
27	26	}
28	27	}
29		- .turbolink-spinner {
30		- color: #FFF;
31		- }
32	28
33	29	.separator {
34	30	background: #31363E;
35	31	border-left: 1px solid #666;
36	32	}
37	33	}
38		-
39		- .main-nav {
40		- background: #f5f5f5;
41		- }
42	34	}
...	...
...	...	@@ -24,7 +24,7 @@
24	24	= label_tag do
25	25	.prev.gray
26	26	= f.radio_button :theme_id, 4
27		- SlateGray
	27	+ Gray
28	28
29	29	= label_tag do
30	30	.prev.violet
...	...