clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3148 from rabuzarus/20170203_-_frio_fix_tabbar_glitch 

Bugfix: frio - the tabbar should be hidden if it is a dirict child of the section element
This commit is contained in:
Tobias Diekershoff 2017-02-03 20:28:23 +01:00 committed by GitHub
parent 2c71d307c8 7f1acdb8e9
commit efc25f744a
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/theme/frio/css/style.css
View File

@ -1719,6 +1719,12 @@ img.acpopup-img {
} }
/* Menubar Tabs */ /* Menubar Tabs */
section > ul.tabbar {
/* The tabbar shouldn't' be visibile inside
the section element. Only after we have
moved it to the nav through js */
display: none !important;
}
#tabmenu, #tabmenu,
.tabbar, .tabbar,
.tabbar > li { .tabbar > li {

4
view/theme/frio/js/theme.js
View File

@ -40,9 +40,7 @@ $(document).ready(function(){
$(".field.select > select, .field.custom > select").addClass("form-control"); $(".field.select > select, .field.custom > select").addClass("form-control");
// move the tabbar to the second nav bar // move the tabbar to the second nav bar
if( $("ul.tabbar").length ) { $("section ul.tabbar").first().appendTo("#topbar-second > .container > #tabmenu");
$("ul.tabbar").appendTo("#topbar-second > .container > #tabmenu");
}
// add mask css url to the logo-img container // add mask css url to the logo-img container
// //

4
view/theme/frio/templates/contacts-template.tpl
View File

@ -1,8 +1,8 @@
{{$tabs}}
<div id="contacts" class="generic-page-wrapper"> <div id="contacts" class="generic-page-wrapper">
{{$tabs}}
{{* The page heading with it's contacts counter *}} {{* The page heading with it's contacts counter *}}
<h2 class="heading">{{$header}} {{if $total}} ({{$total}}) {{/if}}</h2> <h2 class="heading">{{$header}} {{if $total}} ({{$total}}) {{/if}}</h2>