Ticket #2780

modules/boonex/decorous/data/template/system/_sub_header.html

@@ -7,16 +7,16 @@
 	<div id="bx-toolbar" class="bx-header bx-def-image-bg-header bx-def-color-bg-header bx-def-border-header bx-shadow-header bx-def-z-index-nav cd-main-header">
 	    <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-box-sizing">
 	    	<div class="bx-toolbar-content-wrapper bx-content-padding-header">
-                    <div id="bx-toolbar-content" class="bx-clearfix">
-                        <div id="bx-menu-toolbar-1-container">
+                    <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
+                        <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left">
                             <bx_menu:sys_toolbar_site />
                         </div>
-                        <div id="bx-logo-container">
+                        <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo bx-ti-stretcher">
                             <bx_injection:injection_logo_before />
                                 __main_logo__
                             <bx_injection:injection_logo_after />
                         </div>
-                        <div id="bx-menu-toolbar-2-container" class="cd-nav">
+                        <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right cd-nav">
                             <bx_menu:sys_toolbar_member />
                         </div>
                     </div>

modules/boonex/decorous/data/template/system/scripts/BxTemplMenuToolbar.php

@@ -27,15 +27,10 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
         if($this->_bSiteToolbar && in_array($a['name'], array('search')))
             return false;
 
-        $a = BxTemplMenu::_getMenuItem ($a);
+        $a = parent::_getMenuItem ($a);
         if($a === false)
             return $a;
 
-        $a['bx_if:unit'] = array(
-            'condition' => false,
-            'content' => array()
-        );
-
         $a['class_add_a'] = '';
         switch ($a['name']) {
             case 'main-menu':

modules/boonex/lucid/data/template/system/css/general.css

@@ -6,14 +6,7 @@
 	z-index: 500;
 }
 
-#bx-menu-toolbar-1-container,
-#bx-menu-toolbar-2-container {
-	position: relative;
-}
-
 #bx-logo-container {
-	height: auto;
-
     margin-left: 0.625rem;
     margin-right: 0;
 
@@ -21,45 +14,10 @@
 }
 
 #bx-logo-container a span {
-    vertical-align: middle;
+    line-height: normal;
 }
 
-
 /*---Toolbar ---*/
-.bx-toolbar-content {
-	display: -webkit-flex; 
-	display: flex;
-	z-index: 500;
-
-	-webkit-justify-content: flex-start;
-	justify-content: flex-start;
-
-	-webkit-align-items: center;
-	align-items: center;
-
-	-webkit-flex-flow: row nowrap;
-	flex-flow: row nowrap;
-}
-.bx-toolbar-content .bx-toolbar-item {
-	position: relative;
-    -webkit-flex: 0 1 auto; 
-    -ms-flex:  0 1 auto; 
-    flex:  0 1 auto;
-}
-.bx-toolbar-content .bx-toolbar-item.bx-ti-stretcher {
-    -webkit-flex-grow: 1; 
-    flex-grow: 1;
-    white-space: nowrap;
-}
-
-.bx-toolbar-content .bx-toolbar-item.bx-ti-logo {
-    white-space: nowrap;
-}
-
-.bx-toolbar-content .bx-toolbar-item.bx-ti-logo img {
-	display: block;
-}
-
 .bx-toolbar-content .bx-toolbar-item.bx-ti-menu {
 	height: 100%;
 

modules/boonex/lucid/data/template/system/css/media-phone.css

@@ -25,9 +25,6 @@
     -webkit-flex-grow: 1; 
     flex-grow: 1;
 
-    margin-left: 0.625rem;
-    margin-right: 0.625rem;
-
     text-align: center;
     overflow: hidden;
 }

modules/boonex/lucid/data/template/system/scripts/BxTemplMenuToolbar.php

@@ -31,15 +31,10 @@ class BxTemplMenuToolbar extends BxBaseMenuToolbar
         if(!$this->_bSiteToolbar && in_array($a['name'], array('add-content')))
             return false;
 
-        $a = BxTemplMenu::_getMenuItem ($a);
+        $a = parent::_getMenuItem ($a);
         if($a === false)
             return $a;
 
-        $a['bx_if:unit'] = array(
-            'condition' => false,
-            'content' => array()
-        );
-
         $a['class_add_a'] = '';
         switch ($a['name']) {
             case 'bx_lucid_search':

modules/boonex/ocean/data/template/system/_sub_header.html

@@ -8,21 +8,19 @@
 	
 	    <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
 	
-	        <div id="bx-toolbar-content" class="bx-clearfix">
+	        <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
 	
-	            <div id="bx-menu-toolbar-1-container">
+	            <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left">
 	                <bx_menu:sys_toolbar_site />
 	            </div>
 
-	            <div id="bx-logo-container">
-	
+	            <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo bx-ti-stretcher">
 	                <bx_injection:injection_logo_before />
 	                    __main_logo__
 	                <bx_injection:injection_logo_after />
-	
 	            </div>
 	
-	            <div id="bx-menu-toolbar-2-container">
+	            <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right">
 	                <bx_menu:sys_toolbar_member />
 	            </div>
 	

modules/boonex/ocean/data/template/system/css/general.css

@@ -2,21 +2,23 @@
 
 /* --------------- toolbar */
 #bx-toolbar {
-	height: 64px;
+    height: 64px;
     height: 4rem;
 
-	background: -webkit-linear-gradient(#2aaadc, #0079a9);
-	background: -o-linear-gradient(#2aaadc, #0079a9);
-	background: -moz-linear-gradient(#2aaadc, #0079a9);
-	background: linear-gradient(#2aaadc, #0079a9);
-  	border-bottom: 1px solid #4c4c4c;
-	box-shadow: 0px 1px 3px #888;
+    background: -webkit-linear-gradient(#2aaadc, #0079a9);
+    background: -o-linear-gradient(#2aaadc, #0079a9);
+    background: -moz-linear-gradient(#2aaadc, #0079a9);
+    background: linear-gradient(#2aaadc, #0079a9);
+    border-bottom: 1px solid #4c4c4c;
+    box-shadow: 0px 1px 3px #888;
 }
 #bx-logo-container {
-	height: 64px;
+    height: 64px;
     height: 4rem;
-
-	line-height: 64px;
+}
+#bx-logo-container,
+#bx-logo-container a span {
+    line-height: 64px;
     line-height: 4rem;
 }
 

modules/boonex/protean/data/template/system/_sub_header.html

@@ -6,16 +6,16 @@
     <div id="bx-toolbar" class="bx-header bx-def-image-bg-header bx-def-color-bg-header bx-def-border-header bx-shadow-header bx-def-z-index-nav">
         <div class="bx-def-centered bx-def-padding-sec-leftright bx-def-page-width bx-def-box-sizing">
             <div class="bx-toolbar-content-wrapper bx-content-padding-header">
-                    <div id="bx-toolbar-content" class="bx-clearfix">
-                        <div id="bx-menu-toolbar-1-container">
+                    <div id="bx-toolbar-content" class="bx-toolbar-content bx-clearfix">
+                        <div id="bx-menu-toolbar-1-container" class="bx-toolbar-item bx-ti-left">
                             <bx_menu:sys_toolbar_site />
                         </div>
-                        <div id="bx-logo-container">
+                        <div id="bx-logo-container" class="bx-toolbar-item bx-ti-logo bx-ti-stretcher">
                             <bx_injection:injection_logo_before />
                                 __main_logo__
                             <bx_injection:injection_logo_after />
                         </div>
-                        <div id="bx-menu-toolbar-2-container">
+                        <div id="bx-menu-toolbar-2-container" class="bx-toolbar-item bx-ti-right">
                             <bx_menu:sys_toolbar_member />
                         </div>
                     </div>

template/css/general.css

@@ -36,24 +36,43 @@
     height:3rem;
 }
 
-#bx-toolbar-content {
+.bx-toolbar-content {
+    display: -webkit-flex; 
+    display: flex;
+    z-index: 500;
+
+    -webkit-justify-content: flex-start;
+    justify-content: flex-start;
+
+    -webkit-align-items: center;
+    align-items: center;
+
+    -webkit-flex-flow: row nowrap;
+    flex-flow: row nowrap;
+}
+.bx-toolbar-content .bx-toolbar-item {
     position: relative;
+    -webkit-flex: 0 1 auto; 
+    -ms-flex:  0 1 auto; 
+    flex:  0 1 auto;
+}
+.bx-toolbar-content .bx-toolbar-item.bx-ti-stretcher {
+    -webkit-flex-grow: 1; 
+    flex-grow: 1;
+    white-space: nowrap;
 }
 
-#bx-menu-toolbar-1-container,
-#bx-menu-toolbar-2-container {
-    position:absolute;
-    top:0px;
+.bx-toolbar-content .bx-toolbar-item.bx-ti-logo {
+    white-space: nowrap;
 }
 
-#bx-menu-toolbar-1-container {
-    left:0px;
-    text-align:left;
+.bx-toolbar-content .bx-toolbar-item.bx-ti-logo img {
+    display: block;
 }
 
+#bx-menu-toolbar-1-container,
 #bx-menu-toolbar-2-container {
-    right:0px;
-    text-align:right;
+    position:relative;
 }
 
 #bx-logo-container {
@@ -61,35 +80,34 @@
     -ms-box-sizing: border-box;
     box-sizing: border-box;
 
-    height: 48px;
     height: 3rem;
-           
-    margin:0 48px;
-    margin:0 6rem;
+    margin:0 1.0rem;
     
-    vertical-align: middle;
     text-align: center;
+    font-size: 2rem;
+}
+
+#bx-logo-container a {
+    position: relative;
+    display: block;
+
+    text-decoration: none;
 }
 
 #bx-logo-container a span {
-    display:inline-block;
+    position: relative;
+    display: block;
 
-    max-width:100%;
+    max-width: 100%;
 
     line-height: 48px;
     line-height: 3rem;
 
     white-space: nowrap;
-    overflow:hidden;
-    text-overflow:ellipsis;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 
-#bx-logo-container a {
-    text-decoration:none;
-    font-size:32px;
-    font-size:2rem;
-}  
-
 #bx-logo {
     vertical-align:middle;
 }

template/css/media-phone.css

@@ -40,18 +40,18 @@ html.bx-media-phone {
 }
 
 .bx-media-phone .bx-page-wrapper.bx-def-padding-sec-leftright {
-	padding-left: 0px;
-	padding-right: 0px;
+    padding-left: 0px;
+    padding-right: 0px;
 }
 
 
 /* general.css */
-
-.bx-media-phone #bx-logo-container {
-    margin:0 6rem 0 6rem;
+.bx-media-phone #bx-toolbar-content .bx-toolbar-item.bx-ti-logo {
+    margin-left: 0.625rem;
+    margin-right: 0.625rem;
 }
 .bx-media-phone #bx-footer-wrapper {
-	height: auto;
+    height: auto;
 }
 
 /* common.css */