Merge pull request #6538 from minrk/navbar-collapse-xs

collapse navbar on small screen

IPython/html/static/base/less/variables.less

@@ -8,6 +8,7 b''
 @breadcrumb-color: darken(@border_color, 30%);
 @blockquote-font-size: inherit;
 @modal-inner-padding: 15px;
+@grid-float-breakpoint: 540px;
 
 // Disable modal slide-in from top animation.
 .modal {

IPython/html/static/notebook/less/menubar.less

@@ -9,6 +9,12 b''
     border-radius: 0px 0px @border-radius-base @border-radius-base;
   }
 
+  .navbar-toggle {
+    float: left;
+  }
+  .navbar-collapse {
+    clear: left;
+  }
 
   li.dropdown {
     line-height: 12px;
@@ -21,6 +27,7 b''
 
   ul.navbar-right {
     padding-top: 2px;
+    margin-bottom: 0px;
   }
 }
 

IPython/html/static/style/style.min.css

@@ -603,7 +603,7 b' dt {'
 dd {
   margin-left: 0;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .dl-horizontal dt {
     float: left;
     width: 160px;
@@ -3113,7 +3113,7 b' input[type="button"].btn-block {'
   bottom: 100%;
   margin-bottom: 1px;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-right .dropdown-menu {
     left: auto;
     right: 0;
@@ -3640,12 +3640,12 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   margin-bottom: 18px;
   border: 1px solid transparent;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar {
     border-radius: 4px;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-header {
     float: left;
   }
@@ -3662,7 +3662,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
 .navbar-collapse.in {
   overflow-y: auto;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-collapse {
     width: auto;
     border-top: 0;
@@ -3691,7 +3691,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   margin-right: -15px;
   margin-left: -15px;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .container > .navbar-header,
   .container-fluid > .navbar-header,
   .container > .navbar-collapse,
@@ -3704,7 +3704,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   z-index: 1000;
   border-width: 0 0 1px;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-static-top {
     border-radius: 0;
   }
@@ -3716,7 +3716,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   left: 0;
   z-index: 1030;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-fixed-top,
   .navbar-fixed-bottom {
     border-radius: 0;
@@ -3742,7 +3742,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
 .navbar-brand:focus {
   text-decoration: none;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar > .container .navbar-brand,
   .navbar > .container-fluid .navbar-brand {
     margin-left: -15px;
@@ -3772,7 +3772,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
 .navbar-toggle .icon-bar + .icon-bar {
   margin-top: 4px;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-toggle {
     display: none;
   }
@@ -3785,7 +3785,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   padding-bottom: 10px;
   line-height: 18px;
 }
-@media (max-width: 767px) {
+@media (max-width: 539px) {
   .navbar-nav .open .dropdown-menu {
     position: static;
     float: none;
@@ -3807,7 +3807,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
     background-image: none;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-nav {
     float: left;
     margin: 0;
@@ -3823,7 +3823,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
     margin-right: -15px;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-left {
     float: left !important;
     float: left;
@@ -3879,12 +3879,12 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
     top: 0;
   }
 }
-@media (max-width: 767px) {
+@media (max-width: 539px) {
   .navbar-form .form-group {
     margin-bottom: 5px;
   }
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-form {
     width: auto;
     border: 0;
@@ -3924,7 +3924,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   margin-top: 9px;
   margin-bottom: 9px;
 }
-@media (min-width: 768px) {
+@media (min-width: 540px) {
   .navbar-text {
     float: left;
     margin-left: 15px;
@@ -3989,7 +3989,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   background-color: #e7e7e7;
   color: #555555;
 }
-@media (max-width: 767px) {
+@media (max-width: 539px) {
   .navbar-default .navbar-nav .open .dropdown-menu > li > a {
     color: #777777;
   }
@@ -4072,7 +4072,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
   background-color: #080808;
   color: #ffffff;
 }
-@media (max-width: 767px) {
+@media (max-width: 539px) {
   .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
     border-color: #080808;
   }
@@ -9737,6 +9737,12 b' fieldset[disabled] #kernel_selector_widget > button.active {'
   border-top: 1px;
   border-radius: 0px 0px 4px 4px;
 }
+#menubar .navbar-toggle {
+  float: left;
+}
+#menubar .navbar-collapse {
+  clear: left;
+}
 #menubar li.dropdown {
   line-height: 12px;
 }
@@ -9746,6 +9752,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
 }
 #menubar ul.navbar-right {
   padding-top: 2px;
+  margin-bottom: 0px;
 }
 .nav-wrapper {
   border-bottom: 1px solid #e7e7e7;

IPython/html/templates/notebook.html

@@ -59,6 +59,20 b' class="notebook_app"'
 <div id="menubar">
     <div id="menus" class="navbar navbar-default" role="navigation">
         <div class="container-fluid">
+            <button type="button" class="btn btn-default navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
+              <i class="fa fa-bars"></i>
+              <span class="navbar-text">Menu</span>
+            </button>
+            <ul class="nav navbar-nav navbar-right">
+              <li id="kernel_indicator">
+                <i id="kernel_indicator_icon"></i>
+              </li>
+              <li id="modal_indicator">
+                <i id="modal_indicator_icon"></i>
+              </li>
+              <li id="notification_area"></li>
+            </ul>
+            <div class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
                 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
                     <ul id="file_menu" class="dropdown-menu">
@@ -270,15 +284,7 b' class="notebook_app"'
                     </ul>
                 </li>
             </ul>
-            <ul class="nav navbar-nav navbar-right">
-                <li id="kernel_indicator">
-                   <i id="kernel_indicator_icon"></i>
-                </li>
-                <li id="modal_indicator">
-                   <i id="modal_indicator_icon"></i>
-                </li>
-                <li id="notification_area"></li>
-            </ul>
+            </div>
         </div>
     </div>
 </div>