harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bs4 fixes

Browse Source
This commit is contained in:
Mario Vavti 2017-03-18 23:45:55 +01:00
parent 2bdf63d069
commit b2ad4e8c2a
8 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@ -1929,7 +1929,7 @@ function get_responses($conv_responses,$response_verbs,$ob,$item) {
$ret[$v]['list'] = ((x($conv_responses[$v],$item['mid'])) ? $conv_responses[$v][$item['mid'] . '-l'] : '');
if(count($ret[$v]['list']) > MAX_LIKERS) {
$ret[$v]['list_part'] = array_slice($ret[$v]['list'], 0, MAX_LIKERS);
array_push($ret[$v]['list_part'], '<a href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
array_push($ret[$v]['list_part'], '<a class="dropdown-item" href="#" data-toggle="modal" data-target="#' . $v . 'Modal-'
. (($ob) ? $ob->get_id() : $item['id']) . '"><b>' . t('View all') . '</b></a>');
} else {
$ret[$v]['list_part'] = '';

14
view/css/bootstrap-red.css vendored
View File

@ -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 {

3
view/theme/redbasic/css/style.css
View File

@ -1288,8 +1288,7 @@ img.mail-conv-sender-photo {
}
.usermenu {
width: 2.2rem;
height: 2.2rem;
width: 3.5rem;
}
#avatar {

2
view/theme/redbasic/js/redbasic.js
View File

@ -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();

2
view/tpl/connections.tpl
View File

@ -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}}">

2
view/tpl/conv_item.tpl
View File

@ -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>

9
view/tpl/nav.tpl
View File

@ -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">

2
view/tpl/nav_login.tpl
View File

@ -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">