Move new nav into main CSS folder

app/assets/stylesheets/framework.scss

@@ -31,10 +31,12 @@
 @import "framework/mobile";
 @import "framework/modal";
 @import "framework/nav";
+@import "framework/new-nav";
 @import "framework/pagination";
 @import "framework/panels";
 @import "framework/selects";
 @import "framework/sidebar";
+@import "framework/new-sidebar";
 @import "framework/tables";
 @import "framework/notes";
 @import "framework/timeline";

app/views/layouts/_head.html.haml

@@ -32,10 +32,6 @@
   = stylesheet_link_tag "test",        media: "all" if Rails.env.test?
   = stylesheet_link_tag 'performance_bar' if performance_bar_enabled?
-  // TODO: Combine these 2 stylesheets into application.scss
-  = stylesheet_link_tag "new_nav", media: "all"
-  = stylesheet_link_tag "new_sidebar", media: "all"
-
   = Gon::Base.render_data
   - if content_for?(:library_javascripts)

config/application.rb

@@ -105,8 +105,6 @@ module Gitlab
     config.assets.precompile << "lib/ace.js"
     config.assets.precompile << "vendor/assets/fonts/*"
     config.assets.precompile << "test.css"
-    config.assets.precompile << "new_nav.css"
-    config.assets.precompile << "new_sidebar.css"
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'