[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-410-g3420109

[Thomas Sibley]

The branch, 3.9-trunk has been updated
       via  3420109ef51a4d595d620e02667b4685501b98a7 (commit)
       via  aee44957f2ad2ef1cf3484df689e8f75f1338c5b (commit)
       via  c4dba6b4fc9d3a3dd89db93b3642fb8e42174b4c (commit)
      from  8d4567c425f635134b7cab9645f2f6a5b2d040b0 (commit)

Summary of changes:
 share/html/NoAuth/css/images/arrows-grey.png |  Bin 0 -> 256 bytes
 share/html/NoAuth/css/web2/InHeader          |   12 ++++++---
 share/html/NoAuth/css/web2/layout.css        |   11 +++++++-
 share/html/NoAuth/css/web2/nav.css           |   34 ++++++++++++++++++++++++++
 4 files changed, 51 insertions(+), 6 deletions(-)
 create mode 100644 share/html/NoAuth/css/images/arrows-grey.png

- Log -----------------------------------------------------------------
commit c4dba6b4fc9d3a3dd89db93b3642fb8e42174b4c
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 8 15:37:40 2010 -0500

    Simplify the Logged in user menu in the web2 theme

diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index f968210..5ce0004 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -55,7 +55,11 @@
 <script type="text/javascript">
 jQuery(document).ready(function(){
     jQuery("#quick-personal").append('<ul id="prefs-menu"></ul>');
+
+    jQuery("#li-preferences-settings > ul > li").detach().insertAfter("#li-preferences-settings");
+    jQuery("#li-preferences-settings").remove();
     jQuery("#li-preferences").detach().appendTo(jQuery("#prefs-menu"));
+
     jQuery("#li-tools-config").detach().appendTo(jQuery("#app-nav"));
     jQuery("#li-search-simple").detach().insertBefore(jQuery("#li-search"));
     jQuery("#li-tools-approval").detach().appendTo(jQuery("#app-nav"));

commit aee44957f2ad2ef1cf3484df689e8f75f1338c5b
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 8 15:38:24 2010 -0500

    Calling jQuery() on the arguments to insert and append is redundant

diff --git a/share/html/NoAuth/css/web2/InHeader b/share/html/NoAuth/css/web2/InHeader
index 5ce0004..e918f0d 100644
--- a/share/html/NoAuth/css/web2/InHeader
+++ b/share/html/NoAuth/css/web2/InHeader
@@ -58,11 +58,11 @@ jQuery(document).ready(function(){
 
     jQuery("#li-preferences-settings > ul > li").detach().insertAfter("#li-preferences-settings");
     jQuery("#li-preferences-settings").remove();
-    jQuery("#li-preferences").detach().appendTo(jQuery("#prefs-menu"));
+    jQuery("#li-preferences").detach().appendTo("#prefs-menu");
 
-    jQuery("#li-tools-config").detach().appendTo(jQuery("#app-nav"));
-    jQuery("#li-search-simple").detach().insertBefore(jQuery("#li-search"));
-    jQuery("#li-tools-approval").detach().appendTo(jQuery("#app-nav"));
+    jQuery("#li-tools-config").detach().appendTo("#app-nav");
+    jQuery("#li-search-simple").detach().insertBefore("#li-search");
+    jQuery("#li-tools-approval").detach().appendTo("#app-nav");
 
     jQuery("#page-menu.toplevel").addClass('sf-menu sf-js-enabled ').superfish();
     jQuery("#app-nav.toplevel").addClass('sf-menu sf-vertical sf-js-enabled ').superfish();

commit 3420109ef51a4d595d620e02667b4685501b98a7
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Mon Nov 8 15:49:34 2010 -0500

    Tweak the web2 menus so they're more consistent
    
        - Fix the 1px offsets and borders leaking through.
        - Make the submenu arrow indicators more visible

diff --git a/share/html/NoAuth/css/images/arrows-grey.png b/share/html/NoAuth/css/images/arrows-grey.png
new file mode 100644
index 0000000..02441fa
Binary files /dev/null and b/share/html/NoAuth/css/images/arrows-grey.png differ
diff --git a/share/html/NoAuth/css/web2/layout.css b/share/html/NoAuth/css/web2/layout.css
index d760fba..3ba58ae 100644
--- a/share/html/NoAuth/css/web2/layout.css
+++ b/share/html/NoAuth/css/web2/layout.css
@@ -161,11 +161,18 @@ div#quickbar {
     background: #eaeaea;
 }
 
-#prefs-menu.sf-menu li#li-preferences {
+#prefs-menu.sf-menu #li-preferences {
     background: none;
 }
 
-#prefs-menu.sf-menu li:hover, #prefs-menu.sf-menu li.sfHover, #prefs-menu.sf-menu a:focus, #prefs-menu.sf-menu a:hover, #prefs-menu.sf-menu a:active {
+#prefs-menu.sf-menu li:hover,
+#prefs-menu.sf-menu li.sfHover,
+#prefs-menu.sf-menu #li-preferences.sfHover,
+#prefs-menu.sf-menu #li-preferences:hover,
+#prefs-menu.sf-menu a:focus,
+#prefs-menu.sf-menu a:hover,
+#prefs-menu.sf-menu a:active,
+{
     background-color: #CFDEFF;
     text-color: #000;
     color: #000;
diff --git a/share/html/NoAuth/css/web2/nav.css b/share/html/NoAuth/css/web2/nav.css
index a4cb7cf..d4b62ae 100644
--- a/share/html/NoAuth/css/web2/nav.css
+++ b/share/html/NoAuth/css/web2/nav.css
@@ -64,6 +64,40 @@
     padding-left: 0.5em;
 }
 
+#app-nav .sf-sub-indicator {
+    background-image: url(../images/arrows-grey.png);
+    margin-top: -3px;
+}
+
+#app-nav.sf-vertical li:hover ul,
+#app-nav.sf-vertical li.sfHover ul {
+    top: -1px;
+}
+
+#prefs-menu.sf-menu a,
+#prefs-menu .sf-menu a
+{
+    border: none;
+}
+
+#prefs-menu.sf-menu li li li {
+    border-left: 1px solid #ccc;
+}
+
+#prefs-menu.sf-menu li:hover ul,
+#prefs-menu.sf-menu li.sfHover ul {
+    top: 2.4em; /* match the height of the top level li */
+}
+
+#prefs-menu.sf-menu li li:hover ul,
+#prefs-menu.sf-menu li li.sfHover ul {
+    top: 0;
+}
+
+#prefs-menu .sf-sub-indicator {
+    background-image: url(../images/arrows-grey.png);
+}
+
 #main-navigation ul li {
 }
 

-----------------------------------------------------------------------