summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/themes
diff options
context:
space:
mode:
Diffstat (limited to 'app/assets/stylesheets/themes')
-rw-r--r--app/assets/stylesheets/themes/ui_basic.scss13
-rw-r--r--app/assets/stylesheets/themes/ui_color.scss9
-rw-r--r--app/assets/stylesheets/themes/ui_gray.scss9
-rw-r--r--app/assets/stylesheets/themes/ui_mars.scss13
-rw-r--r--app/assets/stylesheets/themes/ui_modern.scss9
5 files changed, 36 insertions, 17 deletions
diff --git a/app/assets/stylesheets/themes/ui_basic.scss b/app/assets/stylesheets/themes/ui_basic.scss
index b377727779a..4e34e8b1b6b 100644
--- a/app/assets/stylesheets/themes/ui_basic.scss
+++ b/app/assets/stylesheets/themes/ui_basic.scss
@@ -4,21 +4,8 @@
*
*/
.ui_basic {
- .app_logo {
- .separator {
- margin-left: 0;
- margin-right: 0;
- }
- }
-
.separator {
- float: left;
- height: 60px;
- width: 1px;
background: white;
border-left: 1px solid #DDD;
- margin-top: -10px;
- margin-left: 10px;
- margin-right: 10px;
}
}
diff --git a/app/assets/stylesheets/themes/ui_color.scss b/app/assets/stylesheets/themes/ui_color.scss
index 8c60fabb3a7..d7a554ff9e5 100644
--- a/app/assets/stylesheets/themes/ui_color.scss
+++ b/app/assets/stylesheets/themes/ui_color.scss
@@ -17,6 +17,15 @@
&.navbar-gitlab {
.navbar-inner {
background: #657;
+ .app_logo {
+ &:hover {
+ background-color: #6A5A7A;
+ }
+ }
+ .separator {
+ background: #546;
+ border-left: 1px solid #706080;
+ }
}
}
}
diff --git a/app/assets/stylesheets/themes/ui_gray.scss b/app/assets/stylesheets/themes/ui_gray.scss
index e80137a69c8..f0547c72157 100644
--- a/app/assets/stylesheets/themes/ui_gray.scss
+++ b/app/assets/stylesheets/themes/ui_gray.scss
@@ -17,6 +17,15 @@
&.navbar-gitlab {
.navbar-inner {
background: #708090;
+ .app_logo {
+ &:hover {
+ background-color: #6A7A8A;
+ }
+ }
+ .separator {
+ background: #607080;
+ border-left: 1px solid #8090A0;
+ }
}
}
}
diff --git a/app/assets/stylesheets/themes/ui_mars.scss b/app/assets/stylesheets/themes/ui_mars.scss
index 9e6433c5f9e..0a78c5c09f5 100644
--- a/app/assets/stylesheets/themes/ui_mars.scss
+++ b/app/assets/stylesheets/themes/ui_mars.scss
@@ -46,21 +46,26 @@
.app_logo {
a {
h1 {
- background: url('logo_white.png') no-repeat 0px 2px;
+ background: url('logo_white.png') no-repeat center center;
color: #eee;
text-shadow: 0 1px 1px #111;
}
}
- .separator {
- display: none;
+ &:hover {
+ background-color: #41464e;
}
-
}
.project_name {
color: #eee;
text-shadow: 0 1px 1px #111;
}
}
+
+ .separator {
+ background: #31363E;
+ border-left: 1px solid #666;
+ }
+
/*
* End of Application Header
*
diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss
index 32b5ad7d968..a5bf414c443 100644
--- a/app/assets/stylesheets/themes/ui_modern.scss
+++ b/app/assets/stylesheets/themes/ui_modern.scss
@@ -17,6 +17,15 @@
&.navbar-gitlab {
.navbar-inner {
background: #567;
+ .app_logo {
+ &:hover {
+ background-color: #516171;
+ }
+ }
+ .separator {
+ background: #456;
+ border-left: 1px solid #678;
+ }
}
}
}