Merge branch 'dev/elastic'

skins/elastic/includes/menu.html

@@ -20,6 +20,6 @@
     </div>
 </div>
 <script type="text/javascript">
-    rcmail.swipe.container_class += ' toolbarmenu';
+    rcmail.swipe.container_class += ' menu';
     rcmail.swipe.element = $('<ul>').addClass(rcmail.swipe.container_class).append($('<li>').append($('<a>').addClass(rcmail.swipe.button_class).append($('<span>').addClass(rcmail.swipe.label_class))));
 </script>

skins/elastic/swipe.less

@@ -119,14 +119,14 @@
   background-color: @color-layout-list-background;
 }
 
-.toolbar a.button.swipe {
+.toolbar.menu a.button.swipe {
   display: none;
 }
 
 // no support in IE
 html.layout-small.touch:not(.ie),
 html.layout-phone.touch:not(.ie) {
-  .toolbar {
+  .toolbar.menu {
     a.button {
       &.swipe {
         display: inline-block;