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

Conflicts:
	lib/gallery.common.css

5 files changed, 53 insertions, 35 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 10a1f35d..63f1ee65 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -708,39 +708,39 @@ div#g-action-status {
 
 /* RTL Corner radius ~~~~~~~~~~~~~~~~~~~~~~ */
 .rtl .g-buttonset .ui-corner-tl {
-	-moz-border-radius-topleft: 0; 
-	-moz-border-radius-topright: 5px; 
+	-moz-border-radius-topleft: 0;
 	-webkit-border-top-left-radius: 0;
-	-webkit-border-top-right-radius: 5px;
 	border-top-left-radius: 0;
-	border-top-right-radius: 5px;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-tr {
 	-moz-border-radius-topright: 0;
-	-moz-border-radius-topleft: 5px;
 	-webkit-border-top-right-radius: 0;
-	-webkit-border-top-left-radius: 5px;
 	border-top-right-radius: 0;
-	border-top-left-radius: 5px;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-bl {
-	-moz-border-radius-bottomleft: 0; 
-	-moz-border-radius-bottomright: 5px; 
+	-moz-border-radius-bottomleft: 0;
 	-webkit-border-bottom-left-radius: 0;
-	-webkit-border-bottom-right-radius: 5px;
 	border-bottom-left-radius: 0;
-	border-bottom-right-radius: 5px;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-br {
 	-moz-border-radius-bottomright: 0;
-	-moz-border-radius-bottomleft: 5px;
 	-webkit-border-bottom-right-radius: 0;
-	-webkit-border-bottom-left-radius: 5px;
 	border-bottom-right-radius: 0;
-	border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-right,
@@ -748,15 +748,15 @@ div#g-action-status {
 	-moz-border-radius-topright: 0;
 	-webkit-border-top-right-radius: 0;
 	border-top-right-radius: 0;
-	-moz-border-radius-topleft: 5px;
-	-webkit-border-top-left-radius: 5px;
-	border-top-left-radius: 5px;
+	-moz-border-radius-topleft: 5px !important;
+	-webkit-border-top-left-radius: 5px !important;
+	border-top-left-radius: 5px !important;
 	-moz-border-radius-bottomright: 0;
 	-webkit-border-bottom-right-radius: 0;
 	border-bottom-right-radius: 0;
-	-moz-border-radius-bottomleft: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	border-bottom-left-radius: 5px;
+	-moz-border-radius-bottomleft: 5px !important;
+	-webkit-border-bottom-left-radius: 5px !important;
+	border-bottom-left-radius: 5px !important;
 }
 
 .rtl .g-buttonset .ui-corner-left,
@@ -764,15 +764,15 @@ div#g-action-status {
 	-moz-border-radius-topleft: 0;
 	-webkit-border-top-left-radius: 0;
 	border-top-left-radius: 0;
-	-moz-border-radius-topright: 5px;
-	-webkit-border-top-right-radius: 5px;
-	border-top-right-radius: 5px;
+	-moz-border-radius-topright: 5px !important;
+	-webkit-border-top-right-radius: 5px !important;
+	border-top-right-radius: 5px !important;
 	-moz-border-radius-bottomleft: 0;
 	-webkit-border-bottom-left-radius: 0;
 	border-bottom-left-radius: 0;
-	-moz-border-radius-bottomright: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	border-bottom-right-radius: 5px;
+	-moz-border-radius-bottomright: 5px !important;
+	-webkit-border-bottom-right-radius: 5px !important;
+	border-bottom-right-radius: 5px !important;
 }
 
 /* RTL Superfish ~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/lib/themeroller/ui.theme.css b/lib/themeroller/ui.theme.css
index 21ece290..477252e5 100644
--- a/lib/themeroller/ui.theme.css
+++ b/lib/themeroller/ui.theme.css
@@ -228,15 +228,15 @@
 ----------------------------------*/
 
 /* Corner radius */
-.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; }
-.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
-.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
-.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; }
-.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-right {  -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; }
-.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; }
-.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; }
+.ui-corner-tl { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; }
+.ui-corner-tr { -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
+.ui-corner-bl { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
+.ui-corner-br { -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+.ui-corner-top { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; }
+.ui-corner-bottom { -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+.ui-corner-right {  -moz-border-radius-topright: 5px; -webkit-border-top-right-radius: 5px; border-top-right-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; }
+.ui-corner-left { -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomleft: 5px; -webkit-border-bottom-left-radius: 5px; border-bottom-left-radius: 5px; }
+.ui-corner-all { -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }
 
 /* Overlays */
 .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
diff --git a/lib/uploadify/uploadify.css b/lib/uploadify/uploadify.css
index a0279443..7eaa9e93 100644
--- a/lib/uploadify/uploadify.css
+++ b/lib/uploadify/uploadify.css
@@ -51,3 +51,8 @@ THE SOFTWARE.
 	width: 1px;
 	height: 3px;
 }
+
+/* RTL support ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .uploadifyQueueItem .cancel {
+	float: left;
+}
\ No newline at end of file
diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index c2fb97e8..e2ad7458 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -197,3 +197,11 @@
 .rtl #g-user-profile .g-avatar {
   margin-left: .6em;
 }
+
+.rtl #g-languages-form table {
+  margin: 0 0 1em 3em;
+}
+
+.rtl #g-translations ol {
+  margin: 0 2em 1em 0;
+}
\ No newline at end of file
diff --git a/themes/admin_wind/css/screen.css b/themes/admin_wind/css/screen.css
index ac47a3db..dbfb59e8 100644
--- a/themes/admin_wind/css/screen.css
+++ b/themes/admin_wind/css/screen.css
@@ -483,3 +483,8 @@ th {
   padding-left: 0;
   padding-right: 1.2em;
 }
+
+.rtl .g-selected img,
+.rtl .g-available .g-block img {
+  margin: 0 0 1em 1em;
+}
\ No newline at end of file