Permalink
Browse files

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

Conflicts:
	lib/gallery.common.css
  • Loading branch information...
2 parents c7ce022 + 2cd784e commit 4a7b41c5a41cbb13e3f4965a065bf88d7152fc9a @bharat bharat committed Jun 20, 2010
@@ -708,71 +708,71 @@ 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,
.rtl .ui-progressbar .ui-corner-right {
-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,
.rtl .ui-progressbar .ui-corner-left {
-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 ~~~~~~~~~~~~~~~~~~~~~~~~~ */
@@ -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); }
@@ -51,3 +51,8 @@ THE SOFTWARE.
width: 1px;
height: 3px;
}
+
+/* RTL support ~~~~~~~~~~~~~~~~~~~~~~~~~ */
+.rtl .uploadifyQueueItem .cancel {
+ float: left;
+}
@@ -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;
+}
@@ -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;
+}

0 comments on commit 4a7b41c

Please sign in to comment.