azkaban-memoizeit

Disable responsiveness.

1/9/2014 7:01:34 AM

Details

diff --git a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
index 693a707..7346df6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executingflowpage.vm
@@ -62,20 +62,20 @@
 		<div class="az-page-header">
 			<div class="container-full" id="flow-status">
         <div class="row">
-          <div class="col-lg-7">
+          <div class="header-title">
             <h1>
               <a href="${context}/executor?execid=${execid}">
                 Flow Execution <small>$execid <span id="flowStatus">-</span></small>
               </a>
             </h1>
           </div>
-          <div class="col-lg-5">
+          <div class="header-control">
             <div class="az-exflow-stats">
-              <div class="col-md-5">
+              <div class="col-xs-5">
                 <p><strong>Submit User</strong> <span id="submitUser">-</span></p>
                 <p><strong>Duration</strong> <span id="duration">-</span></p>
               </div>
-              <div class="col-md-7">
+              <div class="col-xs-7">
                 <p><strong>Start Time</strong> <span id="startTime">-</span></p>
                 <p><strong>End Time</strong> <span id="endTime">-</span></p>
               </div>
@@ -120,7 +120,7 @@
 
     <div class="container-full" id="jobListView">
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<table class="table table-striped table-bordered table-condensed table-hover executions-table">
 						<thead>
 							<tr>
@@ -136,7 +136,7 @@
 						<tbody id="executableBody">
 						</tbody>
 					</table>
-        </div><!-- /.col-lg-12 -->
+        </div><!-- /.col-xs-12 -->
       </div><!-- /.row -->
     </div><!-- /.container-full -->
 
@@ -144,7 +144,7 @@
 
     <div class="container-full container-fill" id="flowLogView">
 			<div class="row">
-				<div class="col-lg-12 col-content">
+				<div class="col-xs-12 col-content">
           <div class="log-viewer">
             <div class="panel panel-default">
               <div class="panel-heading">
@@ -158,7 +158,7 @@
               </div>
             </div><!-- /.panel -->
           </div><!-- /.log-viewer -->
-        </div><!-- /.col-lg-12 -->
+        </div><!-- /.col-xs-12 -->
       </div><!-- /.row -->
     </div><!-- /. -->
 	
diff --git a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
index 91d1d0c..110a1cc 100644
--- a/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/executionspage.vm
@@ -55,7 +55,7 @@
       </ul>
 
 			<div class="row" id="currently-running-view">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
           <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
             <thead>
               <tr>
@@ -98,11 +98,11 @@
 #end
             </tbody>
           </table>
-				</div><!-- /col-lg-12 -->
+				</div><!-- /col-xs-12 -->
 			</div><!-- /row -->
 
 			<div class="row" id="recently-finished-view">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
           <table id="recentlyFinished" class="table table-striped table-bordered table-hover table-condensed executions-table">
             <thead>
               <tr>
@@ -145,7 +145,7 @@
 #end	
             </tbody>
           </table>
-				</div><!-- /col-lg-12 -->
+				</div><!-- /col-xs-12 -->
 			</div><!-- /row -->
 		
 		</div><!-- /container-full -->
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
index cda497a..9543613 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowexecutionpanel.vm
@@ -29,7 +29,7 @@
 							<h4 class="modal-title" id="execute-flow-panel-title"></h4>
 						</div><!-- /modal-header -->
 						<div class="modal-body row">
-							<div class="col-md-4">
+							<div class="col-xs-4">
 								<ul class="nav nav-pills nav-stacked" id="graph-options">
 									<li id="flow-option" viewpanel="svg-div-custom">
 										<a href="#">Flow View</a>
@@ -52,8 +52,8 @@
 										<div class="menu-caption">Add temporary flow parameters that are used to override global settings for each job.</div>
 									</li>
 								</ul>
-							</div><!-- /col-md-4 -->
-							<div class="col-md-8">
+							</div><!-- /col-xs-4 -->
+							<div class="col-xs-8">
 								<div id="execution-graph-options-panel">
 
 ## SVG graph panel.
@@ -181,7 +181,7 @@
 									</div>
 
 								</div><!-- /execution-graph-options-panel -->
-							</div><!-- /col-md-8 -->
+							</div><!-- /col-xs-8 -->
 						</div><!-- /modal-body -->
 
 						<div class="modal-footer">
diff --git a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
index 83dfff0..bd22907 100644
--- a/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/flowpage.vm
@@ -64,10 +64,10 @@
 		<div class="az-page-header">
 			<div class="container-full">
 				<div class="row">
-					<div class="col-lg-6">
+					<div class="col-xs-6">
 						<h1><a href="${context}/manager?project=${project.name}&flow=${flowid}">Flow <small>$flowid</small></a></h1>
 					</div>
-					<div class="col-lg-6">
+					<div class="col-xs-6">
 						<div class="pull-right az-page-header-form">
 							<button type="button" class="btn btn-sm btn-success" id="executebtn">Schedule / Execute Flow</button>
 						</div>
@@ -105,7 +105,7 @@
 
     <div class="container-full" id="executionsView">
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<table class="table table-striped table-bordered table-condensed table-hover" id="execTable">
 						<thead>
 							<tr>
diff --git a/src/java/azkaban/webapp/servlet/velocity/historypage.vm b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
index 63db454..01a64b4 100644
--- a/src/java/azkaban/webapp/servlet/velocity/historypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/historypage.vm
@@ -46,10 +46,10 @@
 		<div class="az-page-header">
       <div class="container-full">
         <div class="row">
-          <div class="col-lg-6">
+          <div class="col-xs-6">
             <h1><a href="${context}/history">History</a></h1>
           </div>
-          <div class="col-lg-6">
+          <div class="col-xs-6">
             <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
               <input type="hidden" name="search" value="true">
               <div class="form-group">
@@ -72,7 +72,7 @@
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
           <table id="executingJobs" class="table table-striped table-bordered table-hover table-condensed executions-table">
             <thead>
               <tr>
@@ -144,7 +144,7 @@
 						<li id="next"><a href="${context}/history?page=${next.page}&size=${next.size}">Next<span class="arrow">&rarr;</span></a></li>
   #end
 					</ul>
-				</div><!-- /col-lg-12 -->
+				</div><!-- /col-xs-12 -->
 			</div><!-- /row -->
 
   ## Advanced Filter Modal.
diff --git a/src/java/azkaban/webapp/servlet/velocity/index.vm b/src/java/azkaban/webapp/servlet/velocity/index.vm
index 159bd1a..73a00d6 100644
--- a/src/java/azkaban/webapp/servlet/velocity/index.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/index.vm
@@ -41,20 +41,20 @@
 		<div class="az-page-header">
       <div class="container-full">
         <div class="row">
-          <div class="col-lg-6">
+          <div class="header-title">
 #if ($allProjects)
             <h1><a href="${context}/index">All Projects</a></h1>
 #else
             <h1><a href="${context}/index">My Projects</a></h1>
 #end
           </div>
-          <div class="col-lg-6">
+          <div class="header-control">
             <form id="search-form" method="get" class="form-inline az-page-header-form" role="form">
               <input type="hidden" name="doaction" value="search">
 #if ($allProjects)
               <input type="hidden" name="all" value="true">				
 #end
-              <div class="form-group col-md-9">
+              <div class="form-group col-xs-9">
                 <div class="input-group">
                   <input id="search-textbox" type="text" placeholder="Project name containing..." value=#if($search_term) ${search_term} #else "" #end class="form-control input-sm" name="searchterm">
                   <span class="input-group-btn">
@@ -63,7 +63,7 @@
                 </div>
               </div>
 #if (!$hideCreateProject)
-              <div class="form-group col-md-3" id="create-project">
+              <div class="form-group col-xs-3" id="create-project">
 ## Note: The Create Project button is not completely flush to the right because
 ## form-group has padding.
                 <div class="pull-right">
@@ -84,7 +84,7 @@
 ## Table of projects.
 
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
           <table class="table table-condensed table-striped table-bordered table-hover" id="all-jobs">
             <thead>
               <tr>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
index 30c8f74..f2f328c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jmxpage.vm
@@ -51,7 +51,7 @@
   ## Web Client JMX 
 
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading">Web Client JMX</div>
 						<table id="all-jmx" class="table table-condensed table-bordered table-striped table-hover">
@@ -101,7 +101,7 @@
 			
   #foreach ($executor in $executorRemoteMBeans.entrySet())
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading">Remote Executor JMX $executor.key</div>
 						<table class="remoteJMX table table-striped table-condensed table-bordered table-hover">
@@ -150,7 +150,7 @@
 			
   #foreach ($triggerserver in $triggerserverRemoteMBeans.entrySet())
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<div class="panel panel-default">
 						<div class="panel-heading">Remote Trigger Server JMX $triggerserver.key</div>
 						<table class="remoteJMX table table-condensed table-striped table-bordered table-hover">
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
index a8df9c2..9b1cd51 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobdetailspage.vm
@@ -51,10 +51,10 @@
 		<div class="az-page-header">
 			<div class="container-full">
 				<div class="row">
-					<div class="col-lg-6">
+					<div class="col-xs-6">
 						<h1><a href="${context}/executor?execid=${execid}&job=${jobid}">Job Execution <small>$jobid</small></a></h1>
 					</div>
-					<div class="col-lg-6">
+					<div class="col-xs-6">
 						<div class="pull-right az-page-header-form">
 							<a href="${context}/manager?project=${projectName}&flow=${flowid}&job=$jobid" class="btn btn-info">Job Properties</a>
 						</div>
@@ -89,7 +89,7 @@
 
     <div class="container-full container-fill" id="jobLogView">
 			<div class="row">
-				<div class="col-lg-12 col-content">
+				<div class="col-xs-12 col-content">
           <div class="log-viewer">
             <div class="panel panel-default">
               <div class="panel-heading">
@@ -111,7 +111,7 @@
 
     <div class="container-full" id="jobSummaryView">
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<table id="commandTable" class="table table-striped table-bordered table-hover">
 					</table>
 				
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
index 0177383..860474a 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobhistorypage.vm
@@ -86,7 +86,7 @@
   ## Time graph and job history table.
 
 			<div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
 					<div class="well well-clear well-sm">
             <div id="timeGraph"></div>
           </div>
@@ -152,7 +152,7 @@
 						<li id="next"><a href="${context}/manager?project=${projectName}&job=${jobid}&history&page=${next.page}&size=${next.size}">Next<span class="arrow">&rarr;</span></a></li>
 					</ul>
 
-				</div><!-- /.col-lg-12 -->
+				</div><!-- /.col-xs-12 -->
 			</div><!-- /.row -->
 
 		</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
index 5dbec1f..e068e48 100644
--- a/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/jobpage.vm
@@ -47,10 +47,10 @@
 		<div class="az-page-header">
 			<div class="container-full">
         <div class="row">
-          <div class="col-lg-6">
+          <div class="col-xs-6">
             <h1><a href="${context}/manager?project=${project.name}&flow=${flowid}&job=${jobid}">Job <small>$jobid</small></a></h1>
           </div>
-          <div class="col-lg-6">
+          <div class="col-xs-6">
             <div class="pull-right az-page-header-form">
               <a href="${context}/manager?project=${project.name}&job=$jobid&history" class="btn btn-info btn-sm">History</a>
             </div>
@@ -102,7 +102,7 @@
 							</tbody>
 						</table>
 					</div>
-				</div><!-- /col-lg-8 -->
+				</div><!-- /col-xs-8 -->
 				<div class="col-xs-6 col-sm-3 sidebar-offcanvas">
 					<div class="well" id="job-summary">
 						<h3>Job <small>$jobid</small></h3>
@@ -158,7 +158,7 @@
 	#end
 						</ul>
 					</div><!-- /panel -->
-				</div><!-- /col-lg-4 -->
+				</div><!-- /col-xs-4 -->
 			</div><!-- /row -->
 
 ## Edit job modal.
diff --git a/src/java/azkaban/webapp/servlet/velocity/nav.vm b/src/java/azkaban/webapp/servlet/velocity/nav.vm
index f709390..91e7e66 100644
--- a/src/java/azkaban/webapp/servlet/velocity/nav.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/nav.vm
@@ -22,13 +22,6 @@
     <div class="navbar navbar-inverse navbar-static-top">
       <div class="container-full">
         <div class="navbar-header">
-#if ($navbar_disabled != 1)
-          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-#end
 					<div class="navbar-logo">
 						<a href="${context}/">Azkaban</a>
 					</div>
diff --git a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
index 43d29c4..da8f880 100644
--- a/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/permissionspage.vm
@@ -232,10 +232,10 @@
             </table>
           </div>
 	
-				</div><!-- /col-lg-8 -->
+				</div><!-- /col-xs-8 -->
 				<div class="col-xs-6 col-sm-3 sidebar-offcanvas">
 	#parse ("azkaban/webapp/servlet/velocity/projectsidebar.vm")
-				</div><!-- /col-lg-4 -->
+				</div><!-- /col-xs-4 -->
 			</div><!-- /row -->
 
 ## Remove proxy user modal dialog.
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
index 8d6e865..2958199 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpage.vm
@@ -91,11 +91,11 @@
             </div>
 	#end
           </div><!-- /#flow-tabs -->
-				</div><!-- /col-lg-8 -->
+				</div><!-- /col-xs-8 -->
 
 				<div class="col-xs-6 col-sm-3 sidebar-offcanvas">
 	#parse ("azkaban/webapp/servlet/velocity/projectsidebar.vm")
-				</div><!-- /col-lg-4 -->
+				</div><!-- /col-xs-4 -->
 			</div><!-- /row -->
 
 	#parse ("azkaban/webapp/servlet/velocity/projectmodals.vm")
diff --git a/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm b/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
index 0936995..6bb0858 100644
--- a/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/projectpageheader.vm
@@ -17,7 +17,7 @@
 		<div class="az-page-header">
 			<div class="container-full">
         <div class="row">
-          <div class="col-lg-6" id="project-page-header">
+          <div class="header-title" id="project-page-header">
             <h1><a href="${context}/manager?project=${project.name}">Project <small>$project.name</small></a></h1>
             <p class="editable" id="project-description">$project.description</p>
             <div id="project-description-form" class="editable-form">
@@ -29,7 +29,7 @@
               </div>
             </div>
           </div>
-          <div class="col-lg-6">
+          <div class="header-control">
             <div class="pull-right az-page-header-form" id="project-options">
               <button id="project-delete-btn" class="btn btn-sm btn-danger">
                 <span class="glyphicon glyphicon-trash"></span> Delete Project
diff --git a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
index c1d3097..9ddfeb5 100644
--- a/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/propertypage.vm
@@ -86,7 +86,7 @@
 							</tbody>
 						</table>
 					</div>
-				</div><!-- /col-lg-8 -->
+				</div><!-- /col-xs-8 -->
 				<div class="col-xs-6 col-sm-3 sidebar-offcanvas">
 					<div class="well" id="job-summary">
 						<h4>Properties <small>$property</small></h4>
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
index 761350d..c1d34d3 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowcalendarpage.vm
@@ -60,7 +60,7 @@
 
     <div class="container-full">
       <div class="row">
-        <div class="col-lg-12">
+        <div class="col-xs-12">
           <div class="pull-right">
             <button type="button" class="nav-prev-week btn btn-default">Previous Week</button>
             <button type="button" class="nav-this-week btn btn-default">Today</button>
diff --git a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
index 87285cf..b95988c 100644
--- a/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/scheduledflowpage.vm
@@ -59,7 +59,7 @@
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
       
       <div class="row">
-				<div class="col-lg-12">
+				<div class="col-xs-12">
           <table id="scheduledFlowsTbl" class="table table-striped table-condensed table-bordered table-hover">
             <thead>
               <tr>
@@ -102,7 +102,7 @@
 	#end
             </tbody>
           </table>
-				</div><!-- /col-lg-12 -->
+				</div><!-- /col-xs-12 -->
 			</div><!-- /row -->
 
   ## Set SLA modal.
diff --git a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
index 542e699..dc81959 100644
--- a/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
+++ b/src/java/azkaban/webapp/servlet/velocity/triggerspage.vm
@@ -57,7 +57,7 @@
   #parse ("azkaban/webapp/servlet/velocity/alerts.vm")
 
 			<div class="row">
-        <div class="col-lg-12">
+        <div class="col-xs-12">
           <table id="triggersTbl" class="table table-striped table-bordered table-condensed table-hover">
             <thead>
               <tr>
diff --git a/src/less/azkaban.less b/src/less/azkaban.less
index da43720..54ba380 100644
--- a/src/less/azkaban.less
+++ b/src/less/azkaban.less
@@ -1,10 +1,12 @@
+@import "non-responsive.less";
+
 @import "base.less";
-@import "offcanvas.less";
+@import "off-canvas.less";
 
 @import "navbar.less";
 @import "header.less";
 
-@import "contextmenu.less";
+@import "context-menu.less";
 @import "tables.less";
 
 @import "login.less";
diff --git a/src/less/base.less b/src/less/base.less
index 573ccc1..897e097 100644
--- a/src/less/base.less
+++ b/src/less/base.less
@@ -2,6 +2,8 @@
   padding: 0 105px;
   margin: 0 auto;
   width: 100%;
+  max-width: none;
+  min-width: 1075px;
 }
 
 .container-fill {
diff --git a/src/less/header.less b/src/less/header.less
index 3ca6d00..e2a45c4 100644
--- a/src/less/header.less
+++ b/src/less/header.less
@@ -35,4 +35,19 @@
   .editable-form {
     display: none;
   }
+
+  .header-title {
+    padding-left: 15px;
+    float: left;
+  }
+
+  .header-control {
+    float: right;
+    padding-right: 15px;
+    width: 500px;
+
+    .form-group {
+      padding: 0;
+    }
+  }
 }
diff --git a/src/less/non-responsive.less b/src/less/non-responsive.less
new file mode 100644
index 0000000..7fa282c
--- /dev/null
+++ b/src/less/non-responsive.less
@@ -0,0 +1,88 @@
+/* Non-responsive overrides
+ *
+ * Utilitze the following CSS to disable the responsive-ness of the container,
+ * grid system, and navbar.
+ */
+
+/* Reset the container */
+.container {
+  max-width: none !important;
+  width: 970px;
+}
+
+.container .navbar-header,
+.container .navbar-collapse {
+  margin-right: 0;
+  margin-left: 0;
+}
+
+/* Always float the navbar header */
+.navbar-header {
+  float: left;
+}
+
+/* Undo the collapsing navbar */
+.navbar-collapse {
+  display: block !important;
+  height: auto !important;
+  padding-bottom: 0;
+  overflow: visible !important;
+}
+
+.navbar-toggle {
+  display: none;
+}
+.navbar-collapse {
+  border-top: 0;
+}
+
+.navbar-brand {
+  margin-left: -15px;
+}
+
+/* Always apply the floated nav */
+.navbar-nav {
+  float: left;
+  margin: 0;
+}
+.navbar-nav > li {
+  float: left;
+}
+.navbar-nav > li > a {
+  padding: 15px;
+}
+
+/* Redeclare since we override the float above */
+.navbar-nav.navbar-right {
+  float: right;
+}
+
+/* Undo custom dropdowns */
+.navbar .navbar-nav .open .dropdown-menu {
+  position: absolute;
+  float: left;
+  background-color: #fff;
+  border: 1px solid #cccccc;
+  border: 1px solid rgba(0, 0, 0, 0.15);
+  border-width: 0 1px 1px;
+  border-radius: 0 0 4px 4px;
+  -webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+          box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+}
+.navbar-default .navbar-nav .open .dropdown-menu > li > a {
+  color: #333;
+}
+.navbar .navbar-nav .open .dropdown-menu > li > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > li > a:focus,
+.navbar .navbar-nav .open .dropdown-menu > .active > a,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .active > a:focus {
+  color: #fff !important;
+  background-color: #428bca !important;
+}
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:hover,
+.navbar .navbar-nav .open .dropdown-menu > .disabled > a:focus {
+  color: #999 !important;
+  background-color: transparent !important;
+}