##// END OF EJS Templates
Merge pull request #6538 from minrk/navbar-collapse-xs...
Matthias Bussonnier -
r18417:7b9c54f0 merge
parent child Browse files
Show More
@@ -8,6 +8,7 b''
8 @breadcrumb-color: darken(@border_color, 30%);
8 @breadcrumb-color: darken(@border_color, 30%);
9 @blockquote-font-size: inherit;
9 @blockquote-font-size: inherit;
10 @modal-inner-padding: 15px;
10 @modal-inner-padding: 15px;
11 @grid-float-breakpoint: 540px;
11
12
12 // Disable modal slide-in from top animation.
13 // Disable modal slide-in from top animation.
13 .modal {
14 .modal {
@@ -8,8 +8,14 b''
8 border-top: 1px;
8 border-top: 1px;
9 border-radius: 0px 0px @border-radius-base @border-radius-base;
9 border-radius: 0px 0px @border-radius-base @border-radius-base;
10 }
10 }
11
11
12
12 .navbar-toggle {
13 float: left;
14 }
15 .navbar-collapse {
16 clear: left;
17 }
18
13 li.dropdown {
19 li.dropdown {
14 line-height: 12px;
20 line-height: 12px;
15
21
@@ -21,6 +27,7 b''
21
27
22 ul.navbar-right {
28 ul.navbar-right {
23 padding-top: 2px;
29 padding-top: 2px;
30 margin-bottom: 0px;
24 }
31 }
25 }
32 }
26
33
@@ -603,7 +603,7 b' dt {'
603 dd {
603 dd {
604 margin-left: 0;
604 margin-left: 0;
605 }
605 }
606 @media (min-width: 768px) {
606 @media (min-width: 540px) {
607 .dl-horizontal dt {
607 .dl-horizontal dt {
608 float: left;
608 float: left;
609 width: 160px;
609 width: 160px;
@@ -3113,7 +3113,7 b' input[type="button"].btn-block {'
3113 bottom: 100%;
3113 bottom: 100%;
3114 margin-bottom: 1px;
3114 margin-bottom: 1px;
3115 }
3115 }
3116 @media (min-width: 768px) {
3116 @media (min-width: 540px) {
3117 .navbar-right .dropdown-menu {
3117 .navbar-right .dropdown-menu {
3118 left: auto;
3118 left: auto;
3119 right: 0;
3119 right: 0;
@@ -3640,12 +3640,12 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3640 margin-bottom: 18px;
3640 margin-bottom: 18px;
3641 border: 1px solid transparent;
3641 border: 1px solid transparent;
3642 }
3642 }
3643 @media (min-width: 768px) {
3643 @media (min-width: 540px) {
3644 .navbar {
3644 .navbar {
3645 border-radius: 4px;
3645 border-radius: 4px;
3646 }
3646 }
3647 }
3647 }
3648 @media (min-width: 768px) {
3648 @media (min-width: 540px) {
3649 .navbar-header {
3649 .navbar-header {
3650 float: left;
3650 float: left;
3651 }
3651 }
@@ -3662,7 +3662,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3662 .navbar-collapse.in {
3662 .navbar-collapse.in {
3663 overflow-y: auto;
3663 overflow-y: auto;
3664 }
3664 }
3665 @media (min-width: 768px) {
3665 @media (min-width: 540px) {
3666 .navbar-collapse {
3666 .navbar-collapse {
3667 width: auto;
3667 width: auto;
3668 border-top: 0;
3668 border-top: 0;
@@ -3691,7 +3691,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3691 margin-right: -15px;
3691 margin-right: -15px;
3692 margin-left: -15px;
3692 margin-left: -15px;
3693 }
3693 }
3694 @media (min-width: 768px) {
3694 @media (min-width: 540px) {
3695 .container > .navbar-header,
3695 .container > .navbar-header,
3696 .container-fluid > .navbar-header,
3696 .container-fluid > .navbar-header,
3697 .container > .navbar-collapse,
3697 .container > .navbar-collapse,
@@ -3704,7 +3704,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3704 z-index: 1000;
3704 z-index: 1000;
3705 border-width: 0 0 1px;
3705 border-width: 0 0 1px;
3706 }
3706 }
3707 @media (min-width: 768px) {
3707 @media (min-width: 540px) {
3708 .navbar-static-top {
3708 .navbar-static-top {
3709 border-radius: 0;
3709 border-radius: 0;
3710 }
3710 }
@@ -3716,7 +3716,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3716 left: 0;
3716 left: 0;
3717 z-index: 1030;
3717 z-index: 1030;
3718 }
3718 }
3719 @media (min-width: 768px) {
3719 @media (min-width: 540px) {
3720 .navbar-fixed-top,
3720 .navbar-fixed-top,
3721 .navbar-fixed-bottom {
3721 .navbar-fixed-bottom {
3722 border-radius: 0;
3722 border-radius: 0;
@@ -3742,7 +3742,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3742 .navbar-brand:focus {
3742 .navbar-brand:focus {
3743 text-decoration: none;
3743 text-decoration: none;
3744 }
3744 }
3745 @media (min-width: 768px) {
3745 @media (min-width: 540px) {
3746 .navbar > .container .navbar-brand,
3746 .navbar > .container .navbar-brand,
3747 .navbar > .container-fluid .navbar-brand {
3747 .navbar > .container-fluid .navbar-brand {
3748 margin-left: -15px;
3748 margin-left: -15px;
@@ -3772,7 +3772,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3772 .navbar-toggle .icon-bar + .icon-bar {
3772 .navbar-toggle .icon-bar + .icon-bar {
3773 margin-top: 4px;
3773 margin-top: 4px;
3774 }
3774 }
3775 @media (min-width: 768px) {
3775 @media (min-width: 540px) {
3776 .navbar-toggle {
3776 .navbar-toggle {
3777 display: none;
3777 display: none;
3778 }
3778 }
@@ -3785,7 +3785,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3785 padding-bottom: 10px;
3785 padding-bottom: 10px;
3786 line-height: 18px;
3786 line-height: 18px;
3787 }
3787 }
3788 @media (max-width: 767px) {
3788 @media (max-width: 539px) {
3789 .navbar-nav .open .dropdown-menu {
3789 .navbar-nav .open .dropdown-menu {
3790 position: static;
3790 position: static;
3791 float: none;
3791 float: none;
@@ -3807,7 +3807,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3807 background-image: none;
3807 background-image: none;
3808 }
3808 }
3809 }
3809 }
3810 @media (min-width: 768px) {
3810 @media (min-width: 540px) {
3811 .navbar-nav {
3811 .navbar-nav {
3812 float: left;
3812 float: left;
3813 margin: 0;
3813 margin: 0;
@@ -3823,7 +3823,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3823 margin-right: -15px;
3823 margin-right: -15px;
3824 }
3824 }
3825 }
3825 }
3826 @media (min-width: 768px) {
3826 @media (min-width: 540px) {
3827 .navbar-left {
3827 .navbar-left {
3828 float: left !important;
3828 float: left !important;
3829 float: left;
3829 float: left;
@@ -3879,12 +3879,12 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3879 top: 0;
3879 top: 0;
3880 }
3880 }
3881 }
3881 }
3882 @media (max-width: 767px) {
3882 @media (max-width: 539px) {
3883 .navbar-form .form-group {
3883 .navbar-form .form-group {
3884 margin-bottom: 5px;
3884 margin-bottom: 5px;
3885 }
3885 }
3886 }
3886 }
3887 @media (min-width: 768px) {
3887 @media (min-width: 540px) {
3888 .navbar-form {
3888 .navbar-form {
3889 width: auto;
3889 width: auto;
3890 border: 0;
3890 border: 0;
@@ -3924,7 +3924,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3924 margin-top: 9px;
3924 margin-top: 9px;
3925 margin-bottom: 9px;
3925 margin-bottom: 9px;
3926 }
3926 }
3927 @media (min-width: 768px) {
3927 @media (min-width: 540px) {
3928 .navbar-text {
3928 .navbar-text {
3929 float: left;
3929 float: left;
3930 margin-left: 15px;
3930 margin-left: 15px;
@@ -3989,7 +3989,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
3989 background-color: #e7e7e7;
3989 background-color: #e7e7e7;
3990 color: #555555;
3990 color: #555555;
3991 }
3991 }
3992 @media (max-width: 767px) {
3992 @media (max-width: 539px) {
3993 .navbar-default .navbar-nav .open .dropdown-menu > li > a {
3993 .navbar-default .navbar-nav .open .dropdown-menu > li > a {
3994 color: #777777;
3994 color: #777777;
3995 }
3995 }
@@ -4072,7 +4072,7 b' select[multiple].input-group-sm > .input-group-btn > .btn {'
4072 background-color: #080808;
4072 background-color: #080808;
4073 color: #ffffff;
4073 color: #ffffff;
4074 }
4074 }
4075 @media (max-width: 767px) {
4075 @media (max-width: 539px) {
4076 .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
4076 .navbar-inverse .navbar-nav .open .dropdown-menu > .dropdown-header {
4077 border-color: #080808;
4077 border-color: #080808;
4078 }
4078 }
@@ -9737,6 +9737,12 b' fieldset[disabled] #kernel_selector_widget > button.active {'
9737 border-top: 1px;
9737 border-top: 1px;
9738 border-radius: 0px 0px 4px 4px;
9738 border-radius: 0px 0px 4px 4px;
9739 }
9739 }
9740 #menubar .navbar-toggle {
9741 float: left;
9742 }
9743 #menubar .navbar-collapse {
9744 clear: left;
9745 }
9740 #menubar li.dropdown {
9746 #menubar li.dropdown {
9741 line-height: 12px;
9747 line-height: 12px;
9742 }
9748 }
@@ -9746,6 +9752,7 b' fieldset[disabled] #kernel_selector_widget > button.active {'
9746 }
9752 }
9747 #menubar ul.navbar-right {
9753 #menubar ul.navbar-right {
9748 padding-top: 2px;
9754 padding-top: 2px;
9755 margin-bottom: 0px;
9749 }
9756 }
9750 .nav-wrapper {
9757 .nav-wrapper {
9751 border-bottom: 1px solid #e7e7e7;
9758 border-bottom: 1px solid #e7e7e7;
@@ -59,7 +59,21 b' class="notebook_app"'
59 <div id="menubar">
59 <div id="menubar">
60 <div id="menus" class="navbar navbar-default" role="navigation">
60 <div id="menus" class="navbar navbar-default" role="navigation">
61 <div class="container-fluid">
61 <div class="container-fluid">
62 <ul class="nav navbar-nav">
62 <button type="button" class="btn btn-default navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
63 <i class="fa fa-bars"></i>
64 <span class="navbar-text">Menu</span>
65 </button>
66 <ul class="nav navbar-nav navbar-right">
67 <li id="kernel_indicator">
68 <i id="kernel_indicator_icon"></i>
69 </li>
70 <li id="modal_indicator">
71 <i id="modal_indicator_icon"></i>
72 </li>
73 <li id="notification_area"></li>
74 </ul>
75 <div class="navbar-collapse collapse">
76 <ul class="nav navbar-nav">
63 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
77 <li class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown">File</a>
64 <ul id="file_menu" class="dropdown-menu">
78 <ul id="file_menu" class="dropdown-menu">
65 <li id="new_notebook"
79 <li id="new_notebook"
@@ -269,16 +283,8 b' class="notebook_app"'
269 </li>
283 </li>
270 </ul>
284 </ul>
271 </li>
285 </li>
272 </ul>
286 </ul>
273 <ul class="nav navbar-nav navbar-right">
287 </div>
274 <li id="kernel_indicator">
275 <i id="kernel_indicator_icon"></i>
276 </li>
277 <li id="modal_indicator">
278 <i id="modal_indicator_icon"></i>
279 </li>
280 <li id="notification_area"></li>
281 </ul>
282 </div>
288 </div>
283 </div>
289 </div>
284 </div>
290 </div>
General Comments 0
You need to be logged in to leave comments. Login now