Fix to Valo menu for iOS (make the header visible)

Change-Id: Ib27db90a6dc48f8f8f34adc3c16aa3aa7222d19d
vaadin · Sep 1, 2014 · 3aca4c7 · 3aca4c7
1 parent 22acb7f
commit 3aca4c7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/WebContent/VAADIN/themes/valo/components/_valo-menu.scss b/WebContent/VAADIN/themes/valo/components/_valo-menu.scss
@@ -75,6 +75,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
     @include valo-menubar-borderless-style;
     margin: round($v-unit-size/2) round($v-unit-size/5);
     display: block;
+    overflow: hidden;
     text-align: center;
     height: auto;
     color: inherit;
@@ -83,6 +84,7 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
       color: inherit;
       white-space: normal;
       line-height: 1.4;
+      margin: 0;
 
       img.v-icon {
         width: round($v-unit-size * 1.5);
@@ -93,6 +95,13 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
         margin: 0 auto .3em;
         border: valo-border();
       }
+
+      &:after {
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+      }
     }
 
     .v-menubar-menuitem-selected {
@@ -150,6 +159,10 @@ $valo-menu-background-color: scale-color($v-app-background-color, $lightness: if
         border-right: none;
       }
 
+      .valo-menu-part {
+        overflow: visible;
+      }
+
       .valo-menu-toggle {
         display: inline-block;
       }

diff --git a/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUI.java b/uitest/src/com/vaadin/tests/themes/valo/ValoThemeUI.java
@@ -175,6 +175,7 @@ public void afterViewChange(ViewChangeEvent event) {
                         break;
                     }
                 }
+                menu.removeStyleName("valo-menu-visible");
             }
         });