From 37d350c3f589779a32ca356047d8c7244ac4878f Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 20 Mar 2017 11:18:23 +0100 Subject: update to latest bs4 from git and change hidden-* classes to d-* --- view/js/mod_cloud.js | 2 +- view/js/mod_network.js | 1 - view/php/default.php | 2 +- view/theme/redbasic/css/style.css | 14 -------------- view/tpl/abook_edit.tpl | 4 ++-- view/tpl/blocklist.tpl | 8 ++++---- view/tpl/chat.tpl | 4 ++-- view/tpl/cloud_directory.tpl | 12 ++++++------ view/tpl/common_tabs.tpl | 4 ++-- view/tpl/jot.tpl | 8 ++++---- view/tpl/layoutlist.tpl | 8 ++++---- view/tpl/locmanage.tpl | 4 ++-- view/tpl/menulist.tpl | 8 ++++---- view/tpl/nav.tpl | 12 ++++++------ view/tpl/prv_message.tpl | 6 +++--- view/tpl/sharedwithme.tpl | 8 ++++---- view/tpl/webpagelist.tpl | 8 ++++---- 17 files changed, 49 insertions(+), 64 deletions(-) (limited to 'view') diff --git a/view/js/mod_cloud.js b/view/js/mod_cloud.js index 8b8a3ba3f..8af90863e 100644 --- a/view/js/mod_cloud.js +++ b/view/js/mod_cloud.js @@ -91,7 +91,7 @@ function prepareHtml(f, i) { '' + '' + f.name + '' + '' + - '' + formatSizeUnits(f.size) + '' + + '' + formatSizeUnits(f.size) + '' + '' + '' + '' + diff --git a/view/js/mod_network.js b/view/js/mod_network.js index cd36786df..2899bbacd 100644 --- a/view/js/mod_network.js +++ b/view/js/mod_network.js @@ -1,5 +1,4 @@ $(document).ready(function() { $("#search-text").contact_autocomplete(baseurl + '/search_ac','',true); - $('.jslider-scale ins').addClass('hidden-xs'); }); diff --git a/view/php/default.php b/view/php/default.php index b8233ca32..950dfbc99 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -15,7 +15,7 @@
- + diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index db06d39c3..b689b3209 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1435,10 +1435,6 @@ blockquote { border-radius: $radius; } -.btn-outline-secondary:hover { - color: $font_colour; -} - /* .navbar-inverse { background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%); @@ -1510,16 +1506,6 @@ blockquote { left: 0px; } - .thread-wrapper.toplevel_item { - width: 100%; - border:1px; - } - - .acl-list-item { - width: 98%; /* fallback if browser does not support calc() */ - width: calc(100% - 10px); - } - } .shareable_element_text { diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 79a6f338f..9fb5c4b18 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -208,8 +208,8 @@ {{if $vcard.fn}}{{$vcard.fn}}{{/if}} - {{if $vcard.emails.0.address}}{{/if}} - {{if $vcard.tels.0}}{{/if}} + {{if $vcard.emails.0.address}}{{$vcard.emails.0.address}}{{/if}} + {{if $vcard.tels.0}}{{$vcard.tels.0.nr}}{{if $is_mobile}} {{/if}}{{/if}} diff --git a/view/tpl/blocklist.tpl b/view/tpl/blocklist.tpl index bdb71ed9d..7f400bba2 100644 --- a/view/tpl/blocklist.tpl +++ b/view/tpl/blocklist.tpl @@ -22,8 +22,8 @@ - {{$created}} - {{$edited}} + {{$created}} + {{$edited}} {{foreach $pages as $key => $items}} {{foreach $items as $item}} @@ -53,10 +53,10 @@ {{/if}} - + {{$item.created}} - + {{$item.edited}} diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index d07adb6b6..6a285dba4 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -60,13 +60,13 @@ -