summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-04-24 09:52:53 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-12 09:27:05 -0500
commit5e9625bf1b0da3bc7a88cdd0d2b33a0813190c98 (patch)
treeb9900ff4c9f10c6c47dda8729b528ddd873486f2
parentcfea48832db7d716a1efc1499fbe5b50ece7ccac (diff)
downloadgitlab-ce-5e9625bf1b0da3bc7a88cdd0d2b33a0813190c98.tar.gz
Add nav border on scroll
-rw-r--r--app/assets/javascripts/layout_nav.js11
-rw-r--r--app/assets/stylesheets/framework/header.scss4
2 files changed, 15 insertions, 0 deletions
diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js
index a5f99bcdd8f..341fc6fc3e4 100644
--- a/app/assets/javascripts/layout_nav.js
+++ b/app/assets/javascripts/layout_nav.js
@@ -1,4 +1,5 @@
/* eslint-disable func-names, space-before-function-paren, no-var, prefer-arrow-callback, no-unused-vars, one-var, one-var-declaration-per-line, vars-on-top, max-len */
+import _ from 'underscore';
(function() {
var hideEndFade;
@@ -45,4 +46,14 @@
}
});
});
+
+ function applyScrollNavClass() {
+ if ($(window).scrollTop() > 0) {
+ $('.navbar-gitlab').addClass('scroll');
+ } else {
+ $('.navbar-gitlab').removeClass('scroll');
+ }
+ }
+
+ $(window).scroll( _.throttle(applyScrollNavClass, 250));
}).call(window);
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index f70f8c51bd4..4650997a9b7 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -42,6 +42,10 @@ header {
border-bottom: none;
}
+ &.scroll {
+ border-bottom: 1px solid $border-color;
+ }
+
.container-fluid {
width: 100% !important;
filter: none;