Merge commit 'upstream/master'

1 files changed, 8 insertions, 58 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 98b4ee40..31988b67 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -273,7 +273,7 @@ form li.g-warning {
 }
 
 .g-short-form li.g-error {
-  padding: .3em 0 .3em 0;
+  padding: .3em 0;
 }
 
 form.g-error input[type="text"],
@@ -294,7 +294,8 @@ li.g-error select {
 
 .g-error,
 .g-denied,
-tr.g-error td.g-error {
+tr.g-error td.g-error,
+#g-add-photos-status .g-error {
   background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
   color: #f00;
 }
@@ -304,7 +305,8 @@ tr.g-error td.g-error {
 }
 
 .g-success,
-.g-allowed {
+.g-allowed,
+#g-add-photos-status .g-success {
   background: #d9efc2 url('images/ico-success.png') no-repeat .4em 50%;
 }
 
@@ -603,60 +605,6 @@ div#g-action-status {
   margin-left: 0;
 }
 
-/* Simple uploader ~~~~~~~~~~~~~~~~~~~~~~~ */
-
-#g-add-photos-canvas {
-  border: 1px solid  #ccc;
-  height: 200px;
-  margin: .5em 0;
-  overflow: auto;
-  width: 469px;
-}
-
-#g-add-photos-status {
-  border: 1px solid  #ccc;
-  height: 125px;
-  margin: .5em 0;
-  overflow: auto;
-  width: 469px;
-}
-
-#g-add-photos button {
-  float: right;
-  margin-bottom: .5em;
-  margin-left: .5em;
-}
-
-#g-add-photos-status li {
-  text-align: left;
-  padding-left: 2em;
-}
-
-#g-add-photos-status li.g-success {
-  background: #d9efc2  url('images/ico-success.png') no-repeat .4em 50%;
-  width: 429px;
-}
-
-#g-add-photos-status li.g-error {
-  background: #f6cbca url('images/ico-error.png') no-repeat .4em 50%;
-  width: 429px;
-/*  color: #f00;*/
-}
-
-#g-add-photos-button {
-  background: #DFEFFC;
-  border: 1px solid #C5DBEC;
-  color: #2E6E9E
-}
-
-#g-add-photos p {
-  margin: 0
-}
-
-#g-add-photos .g-breadcrumbs li {
-  padding-top: .5em;
-}
-
 /** *******************************************************************
  * 7) Right to left language styles
  **********************************************************************/
@@ -685,7 +633,9 @@ div#g-action-status {
 .rtl .g-error,
 .rtl .g-info,
 .rtl .g-success,
-.rtl .g-warning {
+.rtl .g-warning,
+.rtl #g-add-photos-status .g-success,
+.rtl #g-add-photos-status .g-error {
   background-position: center right;
   padding-right: 30px !important;
 }