From 13a30fed4a4734514e88d71a9209274a75a71ca5 Mon Sep 17 00:00:00 2001 From: Felipe Artur Date: Mon, 4 Apr 2016 18:09:27 -0300 Subject: add styles inline --- app/assets/javascripts/sidebar.js.coffee | 3 +-- app/assets/stylesheets/framework/sidebar.scss | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/app/assets/javascripts/sidebar.js.coffee b/app/assets/javascripts/sidebar.js.coffee index 129281b1d35..b60e751d6bc 100644 --- a/app/assets/javascripts/sidebar.js.coffee +++ b/app/assets/javascripts/sidebar.js.coffee @@ -2,15 +2,14 @@ collapsed = 'page-sidebar-collapsed' expanded = 'page-sidebar-expanded' toggleSidebar = -> - $('.sidebar-wrapper').addClass('hide-sidebar') $('.nicescroll').getNiceScroll().remove() + $('.sidebar-wrapper').css('overflow-y','hidden') $('.page-with-sidebar').toggleClass("#{collapsed} #{expanded}") $('header').toggleClass("header-collapsed header-expanded") $('.toggle-nav-collapse i').toggleClass("fa-angle-right fa-angle-left") $.cookie("collapsed_nav", $('.page-with-sidebar').hasClass(collapsed), { path: '/' }) setTimeout ( -> - $('.sidebar-wrapper').removeClass('hide-sidebar') $(".nicescroll").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF") ), 300 diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss index b7176a06652..9d188317783 100644 --- a/app/assets/stylesheets/framework/sidebar.scss +++ b/app/assets/stylesheets/framework/sidebar.scss @@ -20,10 +20,6 @@ transition-duration: .3s; } - .hide-sidebar{ - overflow: hidden !important; - } - .gitlab-text-container-link { z-index: 1; position: absolute; -- cgit v1.2.1