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

view/theme/frio/css/style.css

@@ -1719,6 +1719,12 @@ img.acpopup-img {
 
 }
 /* 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,
 .tabbar,
 .tabbar > li {

view/theme/frio/js/theme.js

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

view/theme/frio/templates/contacts-template.tpl

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