summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 17:20:04 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-01-06 17:20:04 +0200
commite02fdfe87aec686ddf5b6a1af1bd2ed1d732105e (patch)
tree764ff14e7c58f10dfcae288fd9379e6f78e8e526 /app/assets
parent1e1fa558c1cd0eb086b6911dc17164f86495b690 (diff)
downloadgitlab-ci-e02fdfe87aec686ddf5b6a1af1bd2ed1d732105e.tar.gz
Style navbar
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/application.js.coffee1
-rw-r--r--app/assets/stylesheets/main.scss18
2 files changed, 13 insertions, 6 deletions
diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 9277cb6..c0a86b9 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -11,6 +11,7 @@
# GO AFTER THE REQUIRES BELOW.
#
#= require jquery
+#= require bootstrap
#= require jquery_ujs
#= require_tree .
#
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 0e97a5f..70adc44 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -30,16 +30,22 @@ a {
.navbar-brand {
color: #fff;
+
+ &:hover {
+ color: #fff;
+ }
}
.navbar-ci {
- .navbar-inner {
- background: $style_color;
+ background: $style_color;
+
+ .brand,
+ .nav > li > a {
+ color: #fff;
+ text-shadow: 0 1px 0 #167;
- .brand,
- .nav > li > a {
- color: #fff;
- text-shadow: 0 1px 0 #167;
+ &:hover {
+ background: none;
}
}
}