5 files changed, 38 insertions, 27 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 6ff39fff..5d2bce56 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -377,7 +377,7 @@ li.gError select {
   background-color: #e8e8e8;
   background-position: .4em .2em;
   background-repeat: no-repeat;
-  padding: .2em .5em .2em 30px;
+  padding: .4em .5em .4em 30px;
 }
 
 .gError {
@@ -442,7 +442,34 @@ li.gError select {
 
 /** *******************************************************************
  * 6) Navigation and menus
- ****************************************************************** /
+ ******************************************************************/
+
+.sf-menu li {
+  background: #bdd2ff url('../images/bg-buttons.png') 0 12% repeat-x;
+}
+
+.sf-menu li:hover,
+.sf-menu a:hover {
+  background: #cfdeff url('../images/bg-buttons.png') 0 50% repeat-x;
+}
+
+.sf-menu li:active,
+.sf-menu a:active {
+  background: #8ab9ff url('../images/bg-buttons.png') 0 87% repeat-x;
+}
+
+.sf-menu a:hover {
+  text-decoration: none;
+}
+
+.sf-menu li li,
+.sf-menu li li:hover,
+.sf-menu li li a:hover,
+.sf-menu li li li,
+.sf-menu li li li:hover,
+.sf-menu li li li a:hover {
+  background: #bdd2ff;
+}
 
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
@@ -471,10 +498,8 @@ li.gError select {
 #gViewMenu #gHybridLink,
 #gViewMenu #gSlideshowLink,
 #gViewMenu #gFullsizeLink {
-  background-color: #BDD2FF;
   background-repeat: no-repeat;
   background-position: 10px center;
-  color: transparent;
   display: block;
   font-size: .9em;
   height: 22px;
@@ -826,7 +851,7 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 .ui-dialog-titlebar {
   padding: .5em 1.5em .5em 1em;
   color: #444;
-  background: #e6e6e6 url('../images/bg-button-bars.png') 0 14% repeat-x;
+  background: #e6e6e6 url('../images/bg-bars.png') 0 50% repeat-x;
   border-bottom: 1px solid #ccc;
   font-size: 1em;
   font-weight: normal;
@@ -866,7 +891,7 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 .ui-dialog-buttonpane button {
   margin: .5em 0 .5em 8px;
   color: #444444;
-  background: #e6e6e6 url('../images/bg-button-bars.png') 0 14% repeat-x;
+  background: #e6e6e6 url('../images/bg-bars.png') 0 50% repeat-x;
   font-size: 1em;
   border: 1px solid #ccc;
   cursor: pointer;
@@ -875,29 +900,15 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 }
 .ui-dialog-buttonpane button:hover {
   color: #111;
-  background: #eb9300 url('../images/bg-button-bars.png') 0 50% repeat-x;
+  background: #eb9300 url('../images/bg-buttons.png') 0 50% repeat-x;
   border: 1px solid #888;
 }
 .ui-dialog-buttonpane button:active {
   color: #000;
-  background: #8ab9ff url('../images/bg-button-bars.png') 0 87% repeat-x;
+  background: #8ab9ff url('../images/bg-buttons.png') 0 87% repeat-x;
 }
 /* This file skins dialog */
 .ui-dialog.ui-draggable .ui-dialog-titlebar,
 .ui-dialog.ui-draggable .ui-dialog-titlebar {
   cursor: move;
-}
-
-/*clearfix class*/
-.ui-clearfix:after {
-    content: ".";
-    display: block;
-    height: 0;
-    clear: both;
-    visibility: hidden;
-}
-.ui-clearfix {display: inline-block;}
-/* Hides from IE-mac \*/
-* html .ui-clearfix {height: 1%;}
-.ui-clearfix {display: block;}
-/* End hide from IE-mac */
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/themes/default/images/bg-bar.png b/themes/default/images/bg-bar.png
new file mode 100644
index 00000000..deed40b2
--- /dev/null
+++ b/themes/default/images/bg-bar.png
diff --git a/themes/default/images/bg-button-bars.png b/themes/default/images/bg-button-bars.png
deleted file mode 100755
index 038112fd..00000000
--- a/themes/default/images/bg-button-bars.png
+++ /dev/null
diff --git a/themes/default/images/bg-buttons.png b/themes/default/images/bg-buttons.png
new file mode 100644
index 00000000..8694e2da
--- /dev/null
+++ b/themes/default/images/bg-buttons.png
diff --git a/themes/default/views/page.html.php b/themes/default/views/page.html.php
index d4641010..79967c62 100644
--- a/themes/default/views/page.html.php
+++ b/themes/default/views/page.html.php
@@ -17,6 +17,10 @@
           media="screen" />
     <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/screen.css") ?>"
           media="screen,print,projection" />
+    <!--[if lt IE 8]>
+    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
+          media="screen,print,projection" />
+    <![endif]-->
     <script src="<?= url::file("lib/jquery.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.form.js") ?>" type="text/javascript"></script>
     <script src="<?= url::file("lib/jquery.listen.js") ?>" type="text/javascript"></script>
@@ -24,10 +28,6 @@
     <?= $theme->head() ?>
     <?= html::script("lib/jquery-ui.js") ?>
     <script src="<?= $theme->url("js/ui.init.js") ?>" type="text/javascript"></script>
-    <!--[if lt IE 8]>
-    <link rel="stylesheet" type="text/css" href="<?= $theme->url("css/fix-ie.css") ?>"
-          media="screen,print,projection" />
-    <![endif]-->
   </head>
 
   <body>