Merge commit 'upstream/master'

2 files changed, 68 insertions, 29 deletions

diff --git a/themes/default/css/fix-ie.css b/themes/default/css/fix-ie.css
index 0b37acd2..3d9604e6 100644
--- a/themes/default/css/fix-ie.css
+++ b/themes/default/css/fix-ie.css
@@ -10,7 +10,7 @@
   zoom: 1;
 }
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   margin-top: 5px;
   margin-bottom: 0;
 }
diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index c7918fc0..88631e81 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -4,15 +4,15 @@
  * @requires YUI reset, font, grids CSS
  *
  * Sheet organization:
- * 1)  Basic HTML elements
- * 2)  Reusable classes
- * 3)  Reusable content blocks
- * 4)  Page layout containers
- * 5)  Content blocks in specific layout containers
- * 6)  Navigation and menus
- * 7)  Browser hacks
- * 8)  jQuery and jQuery UI
- * 9)  Right-to-left language styles
+ *  1)  Basic HTML elements
+ *  2)  Reusable classes
+ *  3)  Reusable content blocks
+ *  4)  Page layout containers
+ *  5)  Content blocks in specific layout containers
+ *  6)  Navigation and menus
+ *  7)  Browser hacks
+ *  8)  jQuery and jQuery UI
+ *  9)  Right-to-left language styles
  */
 
 /** *******************************************************************
@@ -56,6 +56,10 @@ h2 {
   font-size: 1.2em;
 }
 
+#gSidebar .gBlock li {
+  margin-bottom: .6em;
+}
+
 h3 {
   font-size: 1.2em;
 }
@@ -417,7 +421,7 @@ form .gError,
 
 /* Header  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
-#gHeader #gLogo {
+#gHeader #gLogo img {
   float: left;
   margin: -4px 10px 0 0;
 }
@@ -455,7 +459,8 @@ form .gError,
   font-size: .7em;
   height: 240px;
   overflow: hidden;
-  padding: 14px 8px;
+  padding: 15px 8px 30px 8px;
+  position: relative;
   text-align: center;
   width: 213px;
 }
@@ -483,7 +488,7 @@ form .gError,
 }
 
 #gContent #gPhoto {
-
+  position: relative;
 }
 
 #gContent #gItem .gFullSizeLink img {
@@ -577,6 +582,31 @@ form .gError,
   margin-bottom: 0;
 }
 
+/* Thumb Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+#gContent .gThumbMenu {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  width: 100%;
+}
+
+#gContent .gThumbMenu li {
+  border-left: none;
+  border-right: none;
+  border-bottom: none;
+}
+
+#gContent .gThumbMenu li li {
+  padding: .3em;
+}
+
+#gContent .gThumbMenu a:hover {
+  text-decoration: none;
+}
+
+/* View Menu  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
 #gViewMenu {
   margin-bottom: 1em;
 }
@@ -750,6 +780,16 @@ form .gError,
  * 7) jQuery and jQuery UI
  *********************************************************************/
 
+/* Superfish menu overrides ~~~~~~~~~~~~~~ */
+
+.sf-menu li li, .sf-menu li li ul li {
+  background-color: #bdd2ff;
+}
+
+.sf-menu li:hover {
+  background-color: #dfe9ff;
+}
+
 /* Ajax loading indicator ~~~~~~~~~~~~~~~~ */
 
 .gLoadingLarge {
@@ -865,24 +905,26 @@ form .gError,
 
 /* Server Add */
 
-.gCheckboxTree input {
-  display: inline;
+#gServerAdd button {
+  float: left;
+  margin-bottom: .5em;
 }
 
-.gCheckboxTree li {
-  padding: 0;
-  float: none;
+#gServerAddTree {
+  cursor: pointer;
+  padding-left: 4px;
 }
 
-.gCheckboxTree .ui-icon {
-  cursor: pointer;
+#gServerAddTree li {
+  padding: 0;
+  float: none;
 }
 
-.gFile {
-  padding-left: 2.5em;
+#gServerAddTree span.selected {
+  background: #ddd;
 }
 
-#gServerAdd #gServerAddTree {
+#gServerAddTree {
   border: 1px solid #ccc;
   height: 25em;
   overflow: auto;
@@ -895,10 +937,6 @@ form .gError,
   padding-left: 1.2em;
 }
 
-#gServerAdd ul li .gFile {
-  padding-left: 2.5em;
-}
-
 #gServerAdd .gBreadcrumbs {
   font-size: 1em;
   padding: 0;
@@ -1041,7 +1079,7 @@ form .gError,
 .rtl input[type="submit"],
 .rtl input[type="reset"],
 .rtl .gShortForm li,
-.rtl #gHeader #gLogo,
+.rtl #gHeader #gLogo img,
 .rtl #gContent #gAlbumGrid .gItem,
 .rtl #gSiteMenu,
 .rtl .gBreadcrumbs li,
@@ -1049,4 +1087,5 @@ form .gError,
 .rtl .gButtonSet li,
 .rtl .ui-icon-left .ui-icon {
   float: right;
-}
\ No newline at end of file
+}
+