Fixed #5741 - Separator causes menubar to break to new line

primefaces · Jan 3, 2019 · 0f5d48a · 0f5d48a
1 parent 0b62ce4
commit 0f5d48a
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 4 deletions.
diff --git a/src/app/components/menubar/menubar.css b/src/app/components/menubar/menubar.css
@@ -2,10 +2,6 @@
     padding: .25em;
 }
 
-.ui-menubar .ui-menu-separator {
-    border-width: 1px 0 0 0;
-}
-
 .ui-menubar:after {
     content: "";
     clear: both;
@@ -51,6 +47,12 @@
     display: none;
 }
 
+.ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+    display: inline-block;
+    vertical-align: middle;
+    height: 1.5em;
+}
+
 .ui-menubar .ui-submenu-list {
     display: none;
     position: absolute;

diff --git a/src/app/showcase/components/menubar/menubardemo.html b/src/app/showcase/components/menubar/menubardemo.html
@@ -288,6 +288,7 @@ <h3>Dependencies</h3>
                     &#125;
                 ]
             &#125;,
+            &#123;separator:true&#125;,
             &#123;
                 label: 'Quit', icon: 'pi pi-fw pi-times'
             &#125;

diff --git a/src/app/showcase/components/menubar/menubardemo.ts b/src/app/showcase/components/menubar/menubardemo.ts
@@ -80,6 +80,7 @@ export class MenubarDemo {
                     }
                 ]
             },
+            {separator:true},
             {
                 label: 'Quit', icon: 'pi pi-fw pi-times'
             }

diff --git a/src/assets/components/themes/luna-amber/theme.css b/src/assets/components/themes/luna-amber/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #191919;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #252525;

diff --git a/src/assets/components/themes/luna-blue/theme.css b/src/assets/components/themes/luna-blue/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #191919;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #252525;

diff --git a/src/assets/components/themes/luna-green/theme.css b/src/assets/components/themes/luna-green/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #191919;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #252525;

diff --git a/src/assets/components/themes/luna-pink/theme.css b/src/assets/components/themes/luna-pink/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #191919;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #252525;

diff --git a/src/assets/components/themes/nova-colored/theme.css b/src/assets/components/themes/nova-colored/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #c8c8c8;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #ffffff;

diff --git a/src/assets/components/themes/nova-dark/theme.css b/src/assets/components/themes/nova-dark/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #c8c8c8;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #ffffff;

diff --git a/src/assets/components/themes/nova-light/theme.css b/src/assets/components/themes/nova-light/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #c8c8c8;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #ffffff;

diff --git a/src/assets/components/themes/rhea/theme.css b/src/assets/components/themes/rhea/theme.css
@@ -3037,6 +3037,10 @@ body .ui-menubar {
 body .ui-menubar .ui-menubar-root-list > .ui-menuitem > .ui-menuitem-link {
   padding: 0.714em 0.857em;
 }
+body .ui-menubar .ui-menubar-root-list > .ui-menu-separator {
+  border: 1px solid #c8c8c8;
+  border-width: 0 0 0 1px;
+}
 body .ui-menubar .ui-submenu-list {
   padding: 0;
   background-color: #ffffff;
-Original file line number
+Diff line change
@@ Expand Up / @@ -288,6 +288,7 @@ <h3>Dependencies</h3> @@
                         &#125;
                     ]
                 &#125;,
+                &#123;separator:true&#125;,
                 &#123;
                     label: 'Quit', icon: 'pi pi-fw pi-times'
                 &#125;
@@ Expand Down @@