sayonara, acp menu

public/less/admin/admin.less

@@ -23,15 +23,6 @@
 	padding-top: 70px;
 	background: #f0f0f0;
 
-	.container {
-		width: 100% !important;
-		padding: 0px 15px;
-	}
-
-	.jumbotron {
-		padding: @jumbotron-padding;
-	}
-
 	.btn {
 		border-radius: 0;
 	}
@@ -53,129 +44,10 @@
 		color: #fff;
 	}
 
-	&.mobile {
-		#content {
-			padding-left: 20px;
-		}
-
-		#main-menu {
-			width: 200px;
-			height: 100%;
-
-
-			-webkit-transform: translateX(-190px);
-    		transform: translateX(-190px);
-
-			&.transitioning {
-				.transition(.3s ease all);
-			}
-
-			&.open {
-				-webkit-transform: translateX(0);
-    			transform: translateX(0);
-			}
-		}
-	}
-
-
-	#main-menu {
-		position: fixed;
-		width: 200px;
-		height: 100%;
-		padding-top: 50px;
-		top: 0px;
-		left: 0px;
-		background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKAAAACgAQMAAACxAfVuAAAAA3NCSVQICAjb4U/gAAAABlBMVEU5OTk1NTVxIqOYAAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABZ0RVh0Q3JlYXRpb24gVGltZQAxNC8xMS8xMc34jO8AAAFQSURBVEiJ7ZUxbsMwDEV/68Fbc4M4aC+QsYOhXstDELg3c9CLqPAFNHYo4tKkEBoMhxgoPEkD8aRBIkV+Enh4VRFvswkLwu4HY09m6pXQ/D6NA5lpUMLHtRojmSkq4RyqS2xD9Z2U0DX1Zzo19ZCU6KW6Tx2ZJT1+SDddZuQ7MyEEcqTdk1ECO0b7KSqBQ9i3ElEmcLAv7xJ7JvmW54P8Uqbtlrx5vL1+zDm699ONyI09NDX/zVdUwmlHmeGvVEJHHvB/J6UVh3wTZbtPSpKjMBeHEkwZMcEUHBNMaTLdivh1QRvnyIjJ99ONyI3dSIgJRkJMsMKQdKw5XEpI8m4kxARTRqJ3U3DSGUxpSg8xEpJus9kyEpLXXT/diNzYjYSYYCTEBCMMphWHRkJyp5GQ5MjtyW73dvu8kdDGOSrzqMyjMo/+KUdlHpV5VObR/foD6jrYlpchAFAAAAAASUVORK5CYII=);
-		z-index: 1;
-		overflow-y: auto;
-
-		.nano-content {
-			top: 51px !important;
-		}
-
-		.sidebar-nav {
-			overflow: hidden;
-			.transition(.4s ease-in-out max-height);
-			max-height: 100%;
-			cursor: pointer;
-			max-height: 38px;
-
-			&.open {
-				max-height: 500px;
-			}
-
-			.nav-header {
-				color: #fff;
-				border-top: 1px solid #32353E;
-				border-bottom: 1px solid #1A1C20;
-				background-color: #272727;
-				text-shadow: 0px 0px 2px #111;
-				padding: 10px;
-				.user-select(none);
-			}
-
-			.nav-list {
-				background: #232323;
-
-				li {
-					i {
-						margin-right: 6px;
-					}
-
-					&:hover a {
-						background-color: #3f3f3f;
-
-						span {
-							opacity: 0.8;
-						}
-					}
-
-					&.active a {
-						padding-left: 20px;
-						background-color: #3f3f3f;
-
-						span {
-							opacity: 0;
-						}
-					}
-
-					a {
-						color: white;
-						padding: 7px 15px;
-						font-size: 13px;
-						padding-left: 11px;
-						outline: 0;
-
-						span {
-							opacity: 0;
-							margin-right: -8px;
-							.transition(.3s ease-in opacity);
-						}
-
-						-webkit-transition: background-color .3s ease-in, padding-left .3s ease-in;
-						   -moz-transition: background-color .3s ease-in, padding-left .3s ease-in;
-						     -o-transition: background-color .3s ease-in, padding-left .3s ease-in;
-						        transition: background-color .3s ease-in, padding-left .3s ease-in;
-					}
-				}
-			}
-		}
-	}
-
-	#content {
-		padding-left: 215px;
-		padding-right: 15px;
-	}
-
 	#breadcrumbs {
 		cursor: default;
 	}
 
-	.wrapper {
-		width: 100%;
-		overflow-y: hidden;
-	}
-
 	.acp-panel-heading {
 		padding: 7px 14px;
 		border: 0;
@@ -312,16 +184,6 @@
   display: inline-block;
 }
 
-@media (min-width: 1200px) {
-	.acp-sidebar {
-		position: fixed;
-		top: 70px;
-		right: 15px;
-		width: initial;
-		max-width: calc( ~"(100% - 200px)/4" );
-	}
-}
-
 .category-settings-form {
 	h3 {
 		margin-top: 0;

public/src/admin/admin.js

@@ -3,7 +3,6 @@
 
 (function() {
 	$(document).ready(function() {
-		setupMenu();
 		setupKeybindings();
 
 		if(!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
@@ -18,15 +17,12 @@
 			var url = data.url;
 
 			selectMenuItem(data.url);
-			setupHeaderMenu();
 			setupRestartLinks();
 		});
 
 		$(window).on('action:admin.settingsLoaded', setupCheckboxes);
 
 		$('[component="logout"]').on('click', app.logout);
-
-		$(window).resize(setupHeaderMenu);
 	});
 
 	socket.emit('admin.config.get', function(err, config) {
@@ -45,27 +41,6 @@
 		$(window).trigger('action:config.loaded');
 	});
 
-	function setupMenu() {
-		var listElements = $('.sidebar-nav li');
-
-		listElements.on('click', function() {
-			var $this = $(this);
-
-			if ($this.hasClass('nav-header')) {
-				$this.parents('.sidebar-nav').toggleClass('open').bind('animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd', function (ev) {
-					$('.nano').nanoScroller();
-				});
-			} else {
-				listElements.removeClass('active');
-				$this.addClass('active');
-			}
-		});
-
-		$('.nano').nanoScroller();
-
-		$('#main-menu .nav-list > li a').append('<span class="pull-right"><i class="fa fa-inverse fa-arrow-circle-right"></i>&nbsp;</span>');
-	}
-
 	function setupKeybindings() {
 		Mousetrap.bind('ctrl+shift+a r', function() {
 			require(['admin/modules/instance'], function(instance) {
@@ -138,21 +113,6 @@
 		$('#breadcrumbs').html(caret + Array.prototype.slice.call(arguments).join(caret));
 	}
 
-	function setupHeaderMenu() {
-		var env = utils.findBootstrapEnvironment();
-
-		if (env !== 'lg') {
-			if ($('.mobile-header').length || $('#content .col-lg-9').first().height() < 2000) {
-				return;
-			}
-
-			($('#content .col-lg-3').first().clone().addClass('mobile-header'))
-				.insertBefore($('#content .col-lg-9').first());
-		} else {
-			$('.mobile-header').remove();
-		}
-	}
-
 	function setupRestartLinks() {
 		$('.restart').off('click').on('click', function() {
 			bootbox.confirm('Are you sure you wish to restart NodeBB?', function(confirm) {

public/vendor/nanoscroller/nanoscroller.css

@@ -1,54 +0,0 @@
-/** initial setup **/
-.nano {
-  position : relative;
-  width    : 100%;
-  height   : 100%;
-  overflow : hidden;
-}
-.nano > .nano-content {
-  position      : absolute;
-  overflow      : scroll;
-  overflow-x    : hidden;
-  top           : 0;
-  right         : 0;
-  bottom        : 0;
-  left          : 0;
-}
-.nano > .nano-content:focus {
-  outline: thin dotted;
-}
-.nano > .nano-content::-webkit-scrollbar {
-  display: none;
-}
-.has-scrollbar > .nano-content::-webkit-scrollbar {
-  display: block;
-}
-.nano > .nano-pane {
-  background : rgba(0,0,0,.25);
-  position   : absolute;
-  width      : 10px;
-  right      : 0;
-  top        : 0;
-  bottom     : 0;
-  visibility : hidden\9; /* Target only IE7 and IE8 with this hack */
-  opacity    : .01;
-  -webkit-transition    : .2s;
-  -moz-transition       : .2s;
-  -o-transition         : .2s;
-  transition            : .2s;
-  -moz-border-radius    : 5px;
-  -webkit-border-radius : 5px;
-  border-radius         : 5px;
-}
-.nano > .nano-pane > .nano-slider {
-  background: rgba(255, 255, 255, 0.3);
-  position              : relative;
-  margin                : 0 1px;
-  -moz-border-radius    : 3px;
-  -webkit-border-radius : 3px;
-  border-radius         : 3px;
-}
-.nano:hover > .nano-pane, .nano-pane.active, .nano-pane.flashed {
-  visibility : visible\9; /* Target only IE7 and IE8 with this hack */
-  opacity    : 0.99;
-}

src/views/admin/header.tpl

@@ -149,10 +149,4 @@
 			</div>
 		</nav>
 		
-		<div class="wrapper">
-			<div id="main-menu" class="nano">
-				<div class="nano-content">
-					<!-- IMPORT admin/partials/menu.tpl -->
-				</div>
-			</div>
-			<div class="col-sm-12" id="content">
+		<div class="container" id="content">