summaryrefslogtreecommitdiff
path: root/app/assets
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-08 15:08:39 -0500
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-05-12 09:27:05 -0500
commit0278b912038b1c70f289ab915c4d0752f9aff4b0 (patch)
tree421c38333ef5ed4256a531f0264abf75e0d6a86f /app/assets
parent94919b472425a7149f85cab0f3990e2f16d57c39 (diff)
downloadgitlab-ce-0278b912038b1c70f289ab915c4d0752f9aff4b0.tar.gz
Fix specs
Diffstat (limited to 'app/assets')
-rw-r--r--app/assets/javascripts/layout_nav.js4
-rw-r--r--app/assets/stylesheets/framework/header.scss3
2 files changed, 4 insertions, 3 deletions
diff --git a/app/assets/javascripts/layout_nav.js b/app/assets/javascripts/layout_nav.js
index 17dc3161a1e..8cc0b6d66de 100644
--- a/app/assets/javascripts/layout_nav.js
+++ b/app/assets/javascripts/layout_nav.js
@@ -48,8 +48,8 @@ import _ from 'underscore';
});
function applyScrollNavClass() {
- $('.navbar-border').css("opacity", $(window).scrollTop() / 40);
+ $('.navbar-border').css('opacity', $(window).scrollTop() / 40);
}
- $(window).scroll( _.throttle(applyScrollNavClass, 100));
+ $(window).scroll(_.throttle(applyScrollNavClass, 100));
}).call(window);
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index 1e4556c813a..3014b133754 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -32,7 +32,8 @@ header {
border-bottom: 1px solid $border-color;
position: fixed;
top: 0;
- width: 100%;
+ left: 0;
+ right: 0;
@media (max-width: $screen-xs-min) {
padding: 0 16px;