bs4 fixes

7 files changed, 22 insertions, 12 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index ca715f2f2..5fc836080 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -4,9 +4,19 @@
 
 nav .badge {
 	position: absolute;
-	top: 1px;
-	left: 1px;
+	font-size: 0.75rem;
+}
 
+@media screen and (min-width: 767px) {
+	nav .badge {
+		top: -0.25rem;
+		left: -0.25rem;
+	}
+}
+@media screen and (max-width: 767px) {
+	nav .badge {
+		right: 0px;
+	}
 }
 
 .widget .badge {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 56047cdb4..cd5178688 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1288,8 +1288,7 @@ img.mail-conv-sender-photo {
 }
 
 .usermenu {
-	width: 2.2rem;
-	height: 2.2rem;
+	width: 3.5rem;
 }
 
 #avatar {
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index 07412151f..b522f8dd1 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -26,7 +26,7 @@ $(document).ready(function() {
 		});
 	}
 
-	if(($(window).width() < 767) && ($('#left_aside_wrapper .widget').length > 0))
+	if(($(window).width() < 767) && ($('#left_aside_wrapper .widget, #left_aside_wrapper .vcard').length > 0))
 		$('#expand-aside').show();
 	else
 		$('#expand-aside').hide();
diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl
index a40e1fef9..13261965a 100755
--- a/view/tpl/connections.tpl
+++ b/view/tpl/connections.tpl
@@ -1,7 +1,7 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper clearfix">
 		<div class="dropdown pull-right">
-			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form');">
+			<button type="button" class="btn btn-primary btn-sm" onclick="openClose('contacts-search-form'); $('#contacts-search').focus()">
 				<i class="fa fa-search"></i>&nbsp;{{$label}}
 			</button>
 			<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" title="{{$sort}}">
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 80a249743..22250781c 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -216,8 +216,8 @@
 								<div class="modal-dialog">
 									<div class="modal-content">
 										<div class="modal-header">
-											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 											<h4 class="modal-title">{{$response.title}}</h4>
+											<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 										</div>
 										<div class="modal-body response-list">
 											<ul class="nav nav-pills flex-column">{{foreach $response.list as $liker}}<li class="nav-item">{{$liker}}</li>{{/foreach}}</ul>
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 41c199f2b..3c9de483d 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,10 +1,10 @@
 {{if $nav.login && !$userinfo}}
-<div>
-	<button type="button" class="navbar-toggler" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
+<div class="hidden-md-up">
+	<a class="btn btn-primary btn-sm text-white" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}_collapse" data-toggle="modal" data-target="#nav-login">
 		{{$nav.loginmenu.1.1}}
-	</button>
+	</a>
 	{{if $nav.register}}
-	<a href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" class="navbar-toggler">
+	<a class="btn btn-warning btn-sm text-white" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}" >
 		{{$nav.register.1}}
 	</a>
 	{{/if}}
@@ -32,6 +32,7 @@
 <div class="dropdown usermenu">
 	<div class="fakelink" data-toggle="dropdown">
 		<img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}">
+		<i class="fa fa-caret-down text-white"></i>
 	</div>
 	{{if $localuser}}
 	<div class="dropdown-menu">
diff --git a/view/tpl/nav_login.tpl b/view/tpl/nav_login.tpl
index 8f106b41c..b361b1a14 100644
--- a/view/tpl/nav_login.tpl
+++ b/view/tpl/nav_login.tpl
@@ -3,8 +3,8 @@
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
+				<h4 class="modal-title">{{$nav.loginmenu.1.1}}</h4>
 				<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-				<h3 class="modal-title">{{$nav.loginmenu.1.1}}</h3>
 			</div>
 			<div class="modal-body">
 				<div class="form-group">