Merge commit 'upstream/master'

2 files changed, 70 insertions, 31 deletions

diff --git a/modules/organize/css/organize.css b/modules/organize/css/organize.css
index d8923ea7..22d6e051 100644
--- a/modules/organize/css/organize.css
+++ b/modules/organize/css/organize.css
@@ -3,18 +3,18 @@
  */
 
 #g-organize {
-  height: auto;
   margin: 0 !important;
+  min-height: auto;
   padding: 0 !important;
   position: relative;
   width: 100%;
 }
 
 #g-organize-content-pane {
-  height: auto;
+  height: 100%;
   margin: 0 !important;
   padding: 0 !important;
-  position: relative;
+  position: absolute;
   width: 100%;
 }
 
@@ -23,11 +23,15 @@
  */
 
 #g-organize #g-organize-tree-container {
-  height: 100%;
-  overflow: auto;
   margin: 0;
+  min-height: 100%;
   padding: 0;
-  width: 19%;
+  position: relative;
+  width: 20%;
+}
+
+#g-organize #g-organize-tree-container h3 {
+  margin-bottom: 0.1em;
 }
 
 #g-organize-album-tree {
@@ -38,6 +42,10 @@
   padding: 0 0 .2em 1.2em;
 }
 
+.rtl #g-organize-album-tree ul li {
+  padding: 0 1.2em .2em 0;
+}
+
 .g-organize-album span {
   cursor: pointer;
 }
@@ -49,15 +57,27 @@
   width: auto;
 }
 
+.rtl .g-organize-album-text {
+  cursor: pointer;
+  display: block;
+  margin: 2px 2px 1px 1px;
+  width: auto;
+}
+
+.g-organize-album-text:hover {
+  border-width: 1px;
+  border-style: dotted;
+}
+
 /*******************************************************************
  * Album panel styles
  */
 
 #g-organize #g-organize-detail {
-  height: 100%;
   margin: 0 !important;
-  overflow: hidden;
+  min-height: 100%;
   padding: 0 !important;
+  position: relative;
   width: 80%;
 }
 
@@ -68,35 +88,27 @@
 #g-organize #g-organize-detail .g-message-block li {
   padding-bottom: .2em;
   padding-top: .2em;
-  width: inherit;
-}
-
-#g-organize-microthumb-panel {
-  height: 100%;
-  margin: 0 !important;
-  position: relative;
-  padding: 0 !important;
-  width: 100%;
+  width: auto;
 }
 
 #g-organize-microthumb-grid {
-  height: 100%;
-  overflow: auto;
+  border-width: 1px;
+  border-style: solid;
+  bottom: 1.8em;
+  left: 0;
+  margin: 0 !important;
+  overflow-x: hidden;
+  overflow-y: auto;
   padding: .4em !important;
-  position: relative;
+  position: absolute;
+  right: 0;
+  top: 1.6em;
 }
-
 .g-organize-microthumb-grid-cell {
-  margin: 6px;
-  padding: 0 !important;
-  position: relative;
-}
-
-.g-organize-microthumb {
   display: block;
   height: 100px;
-  margin: 0;
-  padding: .4em 0;
+  margin: 6px;
+  padding: .4em 0 !important;
   position: relative;
   text-align: center;
   width: 110px;
@@ -106,7 +118,7 @@
   z-index: 2000 !important;
 }
 
-.g-organize-microthumb .ui-icon {
+.g-organize-microthumb-grid-cell .ui-icon {
   bottom: 0;
   left: 0;
   position: absolute;
@@ -118,11 +130,22 @@
  */
 
 #g-organize-controls {
+  bottom: 0;
+  height: 1.9em;
+  left: 0;
   margin: 0 !important;
-  padding: .2em .4em;
+  padding: .1em .4em;
+  position: absolute;
+  right: 0;
 }
 
+#g-organize-controls #g-organize-sort-order-text {
+  padding: .2em 0 0 0;
+}
+
+
 #g-organize-controls select {
+  margin-left: .42em;
   display: inline;
 }
 
diff --git a/modules/organize/css/organize_theme.css b/modules/organize/css/organize_theme.css
new file mode 100644
index 00000000..3d289755
--- /dev/null
+++ b/modules/organize/css/organize_theme.css
@@ -0,0 +1,16 @@
+/** *******************************************************************
+ * Organize styles that are theme overrideable
+ *********************************************************************/
+.g-organize-microthumb-grid-cell.ui-selected {
+  background: #DFEFFC !important;
+}
+
+#g-organize-microthumb-grid,
+#g-organize-drop-target-marker,
+.g-organize-album-text:hover {
+  border-color: #79B7E7;
+}
+
+#g-organize-drop-target-marker {
+ background-color: #79B7E7;
+}