Commit 15bc1223c79a8cfbc558b2eaaca06994e0272333
1 parent
ee890f2b
Exists in
master
and in
4 other branches
Work on themes a bit
Showing
9 changed files
with
26 additions
and
25 deletions
Show diff stats
app/assets/stylesheets/sections/header.scss
@@ -120,7 +120,7 @@ header { | @@ -120,7 +120,7 @@ header { | ||
120 | border-bottom: 1px solid #AAA; | 120 | border-bottom: 1px solid #AAA; |
121 | 121 | ||
122 | .nav > li > a { | 122 | .nav > li > a { |
123 | - color: #DDD; | 123 | + color: #AAA; |
124 | text-shadow: 0 1px 0 #444; | 124 | text-shadow: 0 1px 0 #444; |
125 | 125 | ||
126 | &:hover { | 126 | &:hover { |
@@ -130,6 +130,10 @@ header { | @@ -130,6 +130,10 @@ header { | ||
130 | } | 130 | } |
131 | } | 131 | } |
132 | 132 | ||
133 | + .turbolink-spinner { | ||
134 | + color: #FFF; | ||
135 | + } | ||
136 | + | ||
133 | .search { | 137 | .search { |
134 | .search-input { | 138 | .search-input { |
135 | background-color: #D2D5DA; | 139 | background-color: #D2D5DA; |
app/assets/stylesheets/sections/nav.scss
app/assets/stylesheets/sections/themes.scss
@@ -27,15 +27,15 @@ | @@ -27,15 +27,15 @@ | ||
27 | } | 27 | } |
28 | 28 | ||
29 | &.modern { | 29 | &.modern { |
30 | - background: #567; | 30 | + background: #345; |
31 | } | 31 | } |
32 | 32 | ||
33 | &.gray { | 33 | &.gray { |
34 | - background: #708090; | 34 | + background: #373737; |
35 | } | 35 | } |
36 | 36 | ||
37 | &.violet { | 37 | &.violet { |
38 | - background: #657; | 38 | + background: #547; |
39 | } | 39 | } |
40 | } | 40 | } |
41 | } | 41 | } |
app/assets/stylesheets/themes/ui_basic.scss
app/assets/stylesheets/themes/ui_color.scss
@@ -16,15 +16,15 @@ | @@ -16,15 +16,15 @@ | ||
16 | @extend .header-dark; | 16 | @extend .header-dark; |
17 | &.navbar-gitlab { | 17 | &.navbar-gitlab { |
18 | .navbar-inner { | 18 | .navbar-inner { |
19 | - background: #657; | 19 | + background: #547; |
20 | .app_logo { | 20 | .app_logo { |
21 | &:hover { | 21 | &:hover { |
22 | - background-color: #6A5A7A; | 22 | + background-color: #435; |
23 | } | 23 | } |
24 | } | 24 | } |
25 | .separator { | 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 | } |
app/assets/stylesheets/themes/ui_gray.scss
@@ -16,15 +16,15 @@ | @@ -16,15 +16,15 @@ | ||
16 | @extend .header-dark; | 16 | @extend .header-dark; |
17 | &.navbar-gitlab { | 17 | &.navbar-gitlab { |
18 | .navbar-inner { | 18 | .navbar-inner { |
19 | - background: #708090; | 19 | + background: #373737; |
20 | .app_logo { | 20 | .app_logo { |
21 | &:hover { | 21 | &:hover { |
22 | - background-color: #6A7A8A; | 22 | + background-color: #272727; |
23 | } | 23 | } |
24 | } | 24 | } |
25 | .separator { | 25 | .separator { |
26 | - background: #607080; | ||
27 | - border-left: 1px solid #8090A0; | 26 | + background: #272727; |
27 | + border-left: 1px solid #474747; | ||
28 | } | 28 | } |
29 | } | 29 | } |
30 | } | 30 | } |
app/assets/stylesheets/themes/ui_mars.scss
@@ -23,20 +23,12 @@ | @@ -23,20 +23,12 @@ | ||
23 | background-color: #373D47; | 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 | .separator { | 29 | .separator { |
34 | background: #31363E; | 30 | background: #31363E; |
35 | border-left: 1px solid #666; | 31 | border-left: 1px solid #666; |
36 | } | 32 | } |
37 | } | 33 | } |
38 | - | ||
39 | - .main-nav { | ||
40 | - background: #f5f5f5; | ||
41 | - } | ||
42 | } | 34 | } |
app/assets/stylesheets/themes/ui_modern.scss
@@ -16,15 +16,15 @@ | @@ -16,15 +16,15 @@ | ||
16 | @extend .header-dark; | 16 | @extend .header-dark; |
17 | &.navbar-gitlab { | 17 | &.navbar-gitlab { |
18 | .navbar-inner { | 18 | .navbar-inner { |
19 | - background: #567; | 19 | + background: #345; |
20 | .app_logo { | 20 | .app_logo { |
21 | &:hover { | 21 | &:hover { |
22 | - background-color: #516171; | 22 | + background-color: #234; |
23 | } | 23 | } |
24 | } | 24 | } |
25 | .separator { | 25 | .separator { |
26 | - background: #456; | ||
27 | - border-left: 1px solid #678; | 26 | + background: #234; |
27 | + border-left: 1px solid #456; | ||
28 | } | 28 | } |
29 | } | 29 | } |
30 | } | 30 | } |
app/views/profiles/design.html.haml