Merge branch 'master' of git@github.com:gallery/gallery3

1 files changed, 23 insertions, 51 deletions

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 15ce4173..b73c21f0 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -4,7 +4,7 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- *  1)  Basic HTML elements
+ *  1)  Font sizes, base HTML elements
  *  2)  Reusable content blocks
  *  3)  Page layout containers
  *  4)  Content blocks in specific layout containers
@@ -16,7 +16,7 @@
  */
 
 /** *******************************************************************
- * 1) Basic HTML elements
+ * 1) Font sizes, base HTML elements
  **********************************************************************/
 
 body, html {
@@ -56,10 +56,27 @@ h2 {
   margin-bottom: .6em;
 }
 
+#g-content,
+#g-site-menu,
 h3 {
   font-size: 1.2em;
 }
 
+#g-sidebar,
+.g-breadcrumbs {
+  font-size: .9em;
+}
+
+#g-banner,
+#g-footer,
+.g-message {
+  font-size: .8em;
+}
+
+#g-content #g-album-grid .g-item {
+  font-size: .7em;
+}
+
 /* Links ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 a,
@@ -149,21 +166,18 @@ td {
 #g-banner {
   background-color: #e8e8e8;
   border-bottom: 1px solid #ccc;
-  font-size: .8em;
   min-height: 5em;
   padding: 1em 20px;
   position: relative;
 }
 
 #g-content {
-  font-size: 1.2em;
   padding-left: 20px;
   position: relative;
   width: 696px;
 }
 
 #g-sidebar {
-  font-size: .9em;
   padding: 0 20px;
   width: 220px;
 }
@@ -171,7 +185,6 @@ td {
 #g-footer {
   background-color: #e8e8e8;
   border-top: 1px solid #ccc;
-  font-size: .8em;
   margin-top: 20px;
   padding: 10px 20px;
 }
@@ -182,10 +195,6 @@ td {
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#g-banner #g-logo img {
-  margin: 0;
-}
-
 #g-banner #g-quick-search-form {
   clear: right;
   float: right;
@@ -217,7 +226,6 @@ td {
   background-color: #fff;
   border: 1px solid #fff;
   float: left;
-  font-size: .7em;
   padding: .6em 8px;
   position: relative;
   text-align: center;
@@ -295,15 +303,10 @@ td {
  * 5) Navigation and menus
  *********************************************************************/
 
-#g-site-menu {
-  font-size: 1.2em;
-}
-
 /* Login menu ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-banner #g-login-menu {
   color: #999;
-  float: right;
 }
 
 #g-banner #g-login-menu li {
@@ -337,10 +340,6 @@ td {
   width: 100%;
 }
 
-#g-item .g-context-menu {
-  font-size: .7em;
-}
-
 #g-item .g-context-menu ul {
   display: none;
 }
@@ -413,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;
 }