Mercurial > libervia-web

changeset 492:a7f5448a1bc3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
browser_side: fixes the CSS for the menus
author souliane <souliane@mailoo.org>
date Mon, 14 Jul 2014 13:06:24 +0200
parents c97fe4059f71
children 636b6c477a87
files src/browser/public/libervia.css src/browser/sat_browser/menu.py
diffstat 2 files changed, 79 insertions(+), 62 deletions(-) [+]
line wrap: on
line diff
--- a/src/browser/public/libervia.css	Thu Jun 26 08:25:30 2014 +0200
+++ b/src/browser/public/libervia.css	Mon Jul 14 13:06:24 2014 +0200
@@ -145,24 +145,56 @@
     margin: 0 32px 0 20px;   
 }
 
-.gwt-MenuBar,.gwt-MenuBar-horizontal {
-    width: 100%;
-    height: 28px;
+.gwt-MenuBar {
+    /* Common to all menu bars */
     margin: 0;
-    padding: 5px 5px 0 5px;    
-    line-height: 100%;
-    -webkit-box-shadow: 0px 1px 4px #000;
-    box-shadow: 0px 1px 4px #000;
-    border: 1px solid #ddd;
-    border-radius: 0 0 1em 1em;
+}
+
+.gwt-MenuBar table {
+    /* Common to all tables within a menu bar */
+    width: 100%;
+    display: inline-table;
+}
+
+.gwt-MenuBar-horizontal {
+    /* Specific to horizontal menu bars*/
     background-color: #222;
     background: -webkit-gradient(linear, left top, left bottom, from(#444444), to(#222222));
     background: -webkit-linear-gradient(top, #444444, #222222);
     background: linear-gradient(to bottom, #444444, #222222);
+    width: 100%;
+    height: 28px;
+    padding: 5px 5px 0 5px;    
+    border: 1px solid #ddd;
+    border-radius: 0 0 1em 1em;
+    line-height: 100%;
+    -webkit-box-shadow: 0px 1px 4px #000;
+    box-shadow: 0px 1px 4px #000;
     display: inline-block;
 }
 
+.gwt-MenuBar-vertical {
+    /* Specific to vertical menu bars*/
+    background-color: #fff;
+    background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ccc));
+    background: -webkit-linear-gradient(top, #fff, #ccc);
+    background: linear-gradient(to bottom, #fff, #ccc);
+    height: 100%;
+    min-width: 148px;
+    padding: 0;
+    border: solid 1px #aaa;
+    border-radius: 0 0 10px 10px;
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
+}
+
+.gwt-MenuItem img {
+    /* Common to all images within a menu item */
+    padding-right: 2px;
+}
+
 .gwt-MenuBar-horizontal .gwt-MenuItem {
+    /* Specific to items of horizontal menu bars*/
     text-decoration: none;    
     font-weight: bold;
     height: 100%;
@@ -174,18 +206,52 @@
     transition: color 0.2s linear;
 }
 
-.gwt-MenuItem img {
-    padding-right: 2px;
+.gwt-MenuBar-vertical .gwt-MenuItem {
+    /* Specific to items of vertical menu bars*/
+    padding: 8px 15px;
+}
+
+.gwt-MenuBar .gwt-MenuItem-selected {
+    /* Common to all selected items */
+    cursor: pointer;
 }
 
 .gwt-MenuBar-horizontal .gwt-MenuItem-selected {
+    /* Specific to selected items of horizontal menu bars */
     background-color: #eee;
     background: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#aaa));
     background: -webkit-linear-gradient(top, #eee, #aaa);
     background: linear-gradient(to bottom, #eee, #aaa);
     color: #444;
-    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);    
-    cursor: pointer;
+    text-shadow: 0 1px 0 rgba(255, 255, 255, 0.6);
+}
+
+.gwt-MenuBar-vertical .gwt-MenuItem-selected {
+    /* Specific to selected items of vertical menu bars */
+    background: #cf2828 !important;
+    background: -webkit-gradient(linear, left top, left bottom, from(#cf2828), to(#981a1a)) !important;
+    background: -webkit-linear-gradient(top, #cf2828, #981a1a) !important;
+    background: linear-gradient(to bottom, #cf2828, #981a1a) !important;
+    color: #fff !important;
+    border-radius: 0 0 0 0;
+    text-shadow: 0 1px 1px rgba(0, 0, 0, .1);
+    -webkit-transition: color 0.2s linear;
+    transition: color 0.2s linear; 
+}
+
+.gwt-MenuBar-vertical tr:last-child td {
+    /* Specific to last items of vertical menus */
+    border-radius: 0 0 9px 9px !important;
+}
+
+.menuLastPopup .gwt-MenuBar-vertical {
+    /* Specific to the last popup menu of the main menu bar */
+    border-top-right-radius: 9px 9px;
+}
+
+.menuLastPopup .gwt-MenuBar-vertical tr:first-child td {
+    /* Specific to the first item of the last popup menu of the main menu bar */
+    border-radius: 0px 9px 0px 0px !important;
 }
 
 .menuSeparator {
@@ -198,53 +264,6 @@
     cursor: default;
 }
 
-.gwt-MenuBar {
-    background-color: #fff;
-    background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ccc));
-    background: -webkit-linear-gradient(top, #fff, #ccc);
-    background: linear-gradient(to bottom, #fff, #ccc);
-    height: 100%;
-    min-width: 148px;
-    margin: 0;
-    padding: 0;
-    border: solid 1px #aaa;
-    border-radius: 0 0 10px 10px;
-    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
-    box-shadow: 0 1px 3px rgba(0, 0, 0, .3);
-}
-
-.gwt-MenuBar table {
-    width: 100%;
-    display: inline-table;
-}
-
-.gwt-MenuBar .gwt-MenuItem {
-    padding: 8px 15px;
-}
-
-
-.gwt-MenuBar .gwt-MenuItem-selected {
-    background: #cf2828 !important;
-    background: -webkit-gradient(linear, left top, left bottom, from(#cf2828), to(#981a1a)) !important;
-    background: -webkit-linear-gradient(top, #cf2828, #981a1a) !important;
-    background: linear-gradient(to bottom, #cf2828, #981a1a) !important;
-    color: #fff !important;
-    border-radius: 0 0 0 0;
-    text-shadow: 0 1px 1px rgba(0, 0, 0, .1);
-    -webkit-transition: color 0.2s linear;
-    transition: color 0.2s linear; 
-    cursor: pointer;
-}
-
-.gwt-MenuBar tr:last-child td {
-    border-radius: 0 0 9px 9px !important;
-}
-
-
-.menuLastPopup .gwt-MenuBar {
-    border-top-right-radius: 9px 9px;
-}
-
 .gwt-AutoCompleteTextBox {
     width: 80%;
     border: 1px solid #87B3FF;
--- a/src/browser/sat_browser/menu.py	Thu Jun 26 08:25:30 2014 +0200
+++ b/src/browser/sat_browser/menu.py	Mon Jul 14 13:06:24 2014 +0200
@@ -64,8 +64,6 @@
 
     def __init__(self):
         MenuBar.__init__(self, vertical=False)
-        self.setStyleName('gwt-MenuBar-horizontal') # XXX: workaround for the Pyjamas' class name fix (it's now "gwt-MenuBar gwt-MenuBar-horizontal")
-                                                    # TODO: properly adapt CSS to the new class name
 
     def doItemAction(self, item, fireCommand):
         MenuBar.doItemAction(self, item, fireCommand)