2 files changed, 6 insertions, 38 deletions
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 3a24140b..b73c21f0 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -195,10 +195,6 @@ td {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-logo img {
-  margin: 0;
-}
-
 #g-banner #g-quick-search-form {
   clear: right;
   float: right;
@@ -311,7 +307,6 @@ td {
 
 #g-banner #g-login-menu {
   color: #999;
-  float: right;
 }
 
 #g-banner #g-login-menu li {
@@ -417,37 +412,10 @@ td {
 }
 
 /** *******************************************************************
- * 6) Right to left styles
+ * 7) Right to left styles
  *********************************************************************/
 
-.rtl {
-  direction: rtl;
-}
-
-.rtl caption,
-.rtl th,
-.rtl #g-dialog {
-  text-align: right;
-}
-
-.rtl .g-right,
-.rtl #g-header #g-quick-search-form,
-.rtl #g-header #g-login-menu,
-.rtl .ui-icon-right .ui-icon {
-  clear: left;
-  float: left;
-}
-
-.rtl .g-left,
-.rtl form ul ul li,
-.rtl input[type="submit"],
-.rtl input[type="reset"],
-.rtl #g-header #g-logo img,
-.rtl #g-content #g-album-grid .g-item,
-.rtl #g-site-menu,
-.rtl .g-breadcrumbs li,
-.rtl .g-pager li,
-.rtl .g-buttonset li,
-.rtl .ui-icon-left .ui-icon {
-  float: right;
+.rtl #g-site-menu {
+  left: auto;
+  right: 150px;
 }
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1d0e02ce..a2b2fdd7 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -77,14 +77,14 @@
       <?= $theme->site_status() ?>
       <div id="g-header" class="ui-helper-clearfix">
         <div id="g-banner">
-          <?= $theme->header_top() ?>
           <? if ($header_text = module::get_var("gallery", "header_text")): ?>
           <?= $header_text ?>
           <? else: ?>
-          <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
+          <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery home")->for_html_attr() ?>">
             <img width="107" height="48" alt="<?= t("Gallery logo: Your photos on your web site")->for_html_attr() ?>" src="<?= url::file("lib/images/logo.png") ?>" />
           </a>
           <? endif ?>
+          <?= $theme->header_top() ?>
           <div id="g-site-menu">
           <?= $theme->site_menu() ?>
           </div>