@@ -358,6 +358,7 @@ fieldset[disabled] .form-control { | |||||
max-height: 200px; | max-height: 200px; | ||||
overflow-y: auto; | overflow-y: auto; | ||||
overflow-x: hidden; | overflow-x: hidden; | ||||
z-index: 1041; | |||||
} | } | ||||
.ui-autocomplete a { | .ui-autocomplete a { | ||||
transition: none; | transition: none; | ||||
@@ -161,6 +161,36 @@ body { | |||||
margin-right: 3px; | margin-right: 3px; | ||||
border-radius: 4px; | border-radius: 4px; | ||||
} | } | ||||
@media (max-width: 991px) { | |||||
.navbar-desk { | |||||
width: 60% !important; | |||||
} | |||||
.navbar-desk ~ ul > li { | |||||
float: left; | |||||
width: 50px; | |||||
} | |||||
.dropdown-navbar-new-comments > a { | |||||
padding: 8px 0 !important; | |||||
margin-left: 0 !important; | |||||
} | |||||
} | |||||
#searchModal .modal-dialog, | |||||
#searchModal .modal-content { | |||||
background: transparent; | |||||
} | |||||
#searchModal .modal-header { | |||||
background: #fff; | |||||
display: table; | |||||
width: 100%; | |||||
} | |||||
#searchModal .modal-header form, | |||||
#searchModal .modal-header button { | |||||
display: table-cell; | |||||
vertical-align: middle; | |||||
} | |||||
#searchModal .modal-header button { | |||||
height: 30px; | |||||
} | |||||
.dropdown-navbar-new-comments > a { | .dropdown-navbar-new-comments > a { | ||||
border: 0; | border: 0; | ||||
margin-left: 15px; | margin-left: 15px; | ||||
@@ -27,6 +27,36 @@ | |||||
margin-right: 3px; | margin-right: 3px; | ||||
border-radius: 4px; | border-radius: 4px; | ||||
} | } | ||||
@media (max-width: 991px) { | |||||
.navbar-desk { | |||||
width: 60% !important; | |||||
} | |||||
.navbar-desk ~ ul > li { | |||||
float: left; | |||||
width: 50px; | |||||
} | |||||
.dropdown-navbar-new-comments > a { | |||||
padding: 8px 0 !important; | |||||
margin-left: 0 !important; | |||||
} | |||||
} | |||||
#searchModal .modal-dialog, | |||||
#searchModal .modal-content { | |||||
background: transparent; | |||||
} | |||||
#searchModal .modal-header { | |||||
background: #fff; | |||||
display: table; | |||||
width: 100%; | |||||
} | |||||
#searchModal .modal-header form, | |||||
#searchModal .modal-header button { | |||||
display: table-cell; | |||||
vertical-align: middle; | |||||
} | |||||
#searchModal .modal-header button { | |||||
height: 30px; | |||||
} | |||||
.dropdown-navbar-new-comments > a { | .dropdown-navbar-new-comments > a { | ||||
border: 0; | border: 0; | ||||
margin-left: 15px; | margin-left: 15px; | ||||
@@ -79,7 +79,7 @@ frappe.search = { | |||||
.autocomplete(opts).data('ui-autocomplete')._renderItem = | .autocomplete(opts).data('ui-autocomplete')._renderItem = | ||||
frappe.search.render_item; | frappe.search.render_item; | ||||
$("#sidebar-search") | |||||
$("#modal-search") | |||||
.on("focus", open_recent) | .on("focus", open_recent) | ||||
.autocomplete(opts).data('ui-autocomplete')._renderItem = | .autocomplete(opts).data('ui-autocomplete')._renderItem = | ||||
frappe.search.render_item; | frappe.search.render_item; | ||||
@@ -1,6 +1,6 @@ | |||||
<div class="navbar navbar-default navbar-fixed-top" role="navigation"> | <div class="navbar navbar-default navbar-fixed-top" role="navigation"> | ||||
<div class="container"> | <div class="container"> | ||||
<div class="navbar-header"> | |||||
<div class="navbar-header navbar-desk"> | |||||
<a class="navbar-brand toggle-sidebar visible-xs visible-sm"> | <a class="navbar-brand toggle-sidebar visible-xs visible-sm"> | ||||
<i class="octicon octicon-three-bars"></i> | <i class="octicon octicon-three-bars"></i> | ||||
</a> | </a> | ||||
@@ -11,15 +11,34 @@ | |||||
<div class="navbar-center text-ellipsis" style="display: none;"></div> | <div class="navbar-center text-ellipsis" style="display: none;"></div> | ||||
<ul class="nav navbar-nav navbar-right"> | <ul class="nav navbar-nav navbar-right"> | ||||
<div class="dropdown dropdown-navbar-new-comments"> | |||||
<li class="visible-xs visible-sm"> | |||||
<a href="#" data-toggle="modal" data-target="#searchModal"><i class="octicon octicon-search"></i></a> | |||||
</li> | |||||
<li class="dropdown dropdown-navbar-new-comments"> | |||||
<a class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> | <a class="btn dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> | ||||
<span class="navbar-new-comments">0</span></a> | |||||
<span class="navbar-new-comments">0</span> | |||||
</a> | </a> | ||||
<ul class="dropdown-menu" id="dropdown-notification" role="menu" style="max-height: 480px; overflow-y: auto;"> | <ul class="dropdown-menu" id="dropdown-notification" role="menu" style="max-height: 480px; overflow-y: auto;"> | ||||
</ul> | </ul> | ||||
</div> | |||||
</li> | |||||
</ul> | </ul> | ||||
<div id="searchModal" class="modal fade" role="dialog"> | |||||
<div class="modal-dialog" style="height: 50px;"> | |||||
<div class="modal-content"> | |||||
<div class="modal-header"> | |||||
<form role="search" onsubmit="return false;"> | |||||
<div class="input-group" style="width: 100%"> | |||||
<input id="modal-search" type="text" class="form-control" | |||||
placeholder="{%= __("Search or type a command") %}" aria-haspopup="true"> | |||||
</div> | |||||
</form> | |||||
<button type="button" class="close" data-dismiss="modal"><i class="octicon octicon-x"></i></button> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
</div> | |||||
<div class="hidden-xs hidden-sm"> | <div class="hidden-xs hidden-sm"> | ||||
<ul class="nav navbar-nav navbar-right"> | <ul class="nav navbar-nav navbar-right"> | ||||
<li class="dropdown"> | <li class="dropdown"> | ||||
@@ -167,6 +167,7 @@ textarea.form-control { | |||||
max-height: 200px; | max-height: 200px; | ||||
overflow-y: auto; | overflow-y: auto; | ||||
overflow-x: hidden; | overflow-x: hidden; | ||||
z-index: 1041; | |||||
} | } | ||||
.ui-autocomplete a { | .ui-autocomplete a { | ||||
@@ -35,6 +35,40 @@ | |||||
border-radius: 4px; | border-radius: 4px; | ||||
} | } | ||||
@media (max-width: 991px) { | |||||
.navbar-desk { | |||||
width: 60% !important; | |||||
& ~ ul > li { | |||||
float: left; | |||||
width: 50px; | |||||
} | |||||
} | |||||
.dropdown-navbar-new-comments > a { | |||||
padding: 8px 0 !important; | |||||
margin-left: 0 !important; | |||||
} | |||||
} | |||||
#searchModal { | |||||
.modal-dialog, .modal-content { | |||||
background: transparent; | |||||
} | |||||
.modal-header { | |||||
background: #fff; | |||||
display: table; | |||||
width: 100%; | |||||
form, button { | |||||
display: table-cell; | |||||
vertical-align: middle; | |||||
} | |||||
button { | |||||
height: 30px; | |||||
} | |||||
} | |||||
} | |||||
.dropdown-navbar-new-comments { | .dropdown-navbar-new-comments { | ||||
& > a { | & > a { | ||||
border: 0; | border: 0; | ||||