3 files changed, 33 insertions, 8 deletions
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index fbcdf4ae..233cacaf 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -195,6 +195,12 @@ th {
  * 3) Page layout containers
  *********************************************************************/
 
+/* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#g-header #g-login-menu {
+  margin-top: 1em;
+}
+
 /* View container ~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 .g-view {
@@ -217,7 +223,7 @@ th {
 
 #g-content {
   font-size: 1.1em;
-  padding-left: 20px;
+  padding: 0 2em;
   width: 96%;
 }
 
@@ -457,11 +463,6 @@ th {
  * 7) Right to left styles
  *********************************************************************/
 
-.rtl #g-admin-menu {
-  left: auto;
-  right: 150px;
-}
-
 .rtl #g-content #g-album-grid .g-item,
 .rtl #g-site-theme,
 .rtl #g-admin-theme,
@@ -478,3 +479,14 @@ th {
   margin-left: 1em;
   margin-right: 0em;
 }
+
+.rtl #g-site-admin-menu {
+  left: auto;
+  right: 150px;
+}
+
+.rtl #g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
diff --git a/themes/admin_wind/views/admin.html.php b/themes/admin_wind/views/admin.html.php
index e554b817..25ba1c97 100644
--- a/themes/admin_wind/views/admin.html.php
+++ b/themes/admin_wind/views/admin.html.php
@@ -41,7 +41,7 @@
     <div id="doc3" class="yui-t7 g-view">
     <? endif; ?>
       <?= $theme->site_status() ?>
-      <div id="g-header">
+      <div id="g-header" class="ui-helper-clearfix">
         <?= $theme->admin_header_top() ?>
         <ul id="g-login-menu" class="g-inline g-right">
           <li class="g-first">
@@ -57,7 +57,7 @@
           </li>
           <li id="g-logout-link"><a href="<?= url::site("logout?csrf=$csrf&amp;continue=" . urlencode(item::root()->url())) ?>"><?= t("Logout") ?></a></li>
         </ul>
-        <a id="g-logo" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
+        <a id="g-logo" class="g-left" href="<?= item::root()->url() ?>" title="<?= t("go back to the Gallery")->for_html_attr() ?>">
           &larr; <?= t("back to the ...") ?>
         </a>
         <div id="g-site-admin-menu" class="ui-helper-clearfix">
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index b73c21f0..acc6af03 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -307,6 +307,7 @@ td {
 
 #g-banner #g-login-menu {
   color: #999;
+  float: right;
 }
 
 #g-banner #g-login-menu li {
@@ -415,6 +416,18 @@ td {
  * 7) Right to left styles
  *********************************************************************/
 
+.rtl #g-header #g-login-menu,
+.rtl #g-header #g-quick-search-form {
+  clear: left;
+  float: left;
+}
+
+.rtl #g-header #g-login-menu li {
+  margin-left: 0;
+  padding-left: 0;
+  padding-right: 1.2em;
+}
+
 .rtl #g-site-menu {
   left: auto;
   right: 150px;