summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--themes/admin_wind/css/screen.css1
-rw-r--r--themes/admin_wind/js/ui.init.js17
-rw-r--r--themes/wind/css/screen.css1
-rw-r--r--themes/wind/js/ui.init.js16
4 files changed, 18 insertions, 17 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index 2ecf0eb9..58a72baa 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -601,7 +601,6 @@ li.g-group-disable h4, li.g-group-disable .g-user {
#g-site-admin-menu {
bottom: 0;
- display: none;
font-size: 1.2em;
left: 140px;
position: absolute;
diff --git a/themes/admin_wind/js/ui.init.js b/themes/admin_wind/js/ui.init.js
index 8d34241f..0954b63c 100644
--- a/themes/admin_wind/js/ui.init.js
+++ b/themes/admin_wind/js/ui.init.js
@@ -1,17 +1,20 @@
+/**
+ * Initialize jQuery UI and Gallery Plugins
+ */
+
$(document).ready(function(){
+
// Initialize Superfish menus
- $("#g-site-admin-menu ul.g-menu").addClass("sf-menu");
- $("ul.g-menu").addClass("sf-menu");
- $("ul.sf-menu").superfish({
+ $("#g-site-admin-menu .g-menu").hide().addClass("sf-menu");
+ $("#g-site-admin-menu .g-menu").superfish({
delay: 500,
animation: {
opacity: "show",
height: "show"
},
- pathClass: "current",
+ pathClass: "g-selected",
speed: "fast"
- });
- $("#g-site-admin-menu").css("display", "block");
+ }).show();
// Initialize status message effects
$("#g-action-status li").gallery_show_message();
@@ -35,7 +38,7 @@ $(document).ready(function(){
// Round view menu buttons
if ($("#g-admin-comments-menu").length) {
- $("#g-admin-comments-menu ul").removeClass("g-menu").removeClass("sf-menu");
+ $("#g-admin-comments-menu ul").removeClass("g-menu");
$("#g-admin-comments-menu").addClass("g-buttonset");
$("#g-admin-comments-menu a").addClass("g-button ui-state-default");
$("#g-admin-comments-menu ul li:first a").addClass("ui-corner-left");
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 5c65e344..ab3730c7 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -483,7 +483,6 @@ li.g-error select {
#g-site-menu {
bottom: 0;
- display: none;
left: 140px;
position: absolute;
}
diff --git a/themes/wind/js/ui.init.js b/themes/wind/js/ui.init.js
index 357e6081..f45ba84a 100644
--- a/themes/wind/js/ui.init.js
+++ b/themes/wind/js/ui.init.js
@@ -1,20 +1,20 @@
/**
- * Initialize jQuery UI and Gallery Plugin elements
+ * Initialize jQuery UI and Gallery Plugins
*/
$(document).ready(function() {
- // Initialize Superfish menus
- $("ul.g-menu").addClass("sf-menu");
- $('ul.sf-menu').superfish({
+ // Initialize Superfish menus (hidden, then shown to address IE issue)
+ $("#g-site-menu .g-menu").hide().addClass("sf-menu");
+ $("#g-site-menu .g-menu").superfish({
delay: 500,
animation: {
opacity:'show',
height:'show'
},
+ pathClass: "g-selected",
speed: 'fast'
- });
- $("#g-site-menu").css("display", "block");
+ }).show();
// Initialize status message effects
$("#g-action-status li").gallery_show_message();
@@ -23,7 +23,7 @@ $(document).ready(function() {
$("#g-login-link").addClass("g-dialog-link");
$(".g-dialog-link").gallery_dialog();
- // Apply jQuery UI button css to submit inputs
+ // Apply jQuery UI icon, hover, and rounded corner styles
$(".g-short-form input[type=text]").addClass("ui-corner-left");
$(".g-short-form input[type=submit]").addClass("ui-state-default ui-corner-right");
$("input[type=submit]:not(.g-short-form input)").addClass("ui-state-default ui-corner-all");
@@ -32,7 +32,7 @@ $(document).ready(function() {
$("#g-view-menu a").addClass("ui-icon");
}
- // Apply styles and icon classes to g-context-menu
+ // Apply jQuery UI icon and hover styles to context menus
if ($(".g-context-menu").length) {
$(".g-context-menu li").addClass("ui-state-default");
$(".g-context-menu a").addClass("g-button ui-icon-left");