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

2 files changed, 19 insertions, 18 deletions

diff --git a/modules/gallery/css/gallery.css b/modules/gallery/css/gallery.css
index 08bd4749..fb72bd48 100644
--- a/modules/gallery/css/gallery.css
+++ b/modules/gallery/css/gallery.css
@@ -81,35 +81,19 @@
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-edit-permissions-form {
-	clear: both;
+  clear: both;
 }
 
 #g-edit-permissions-form th {
   text-align: center;
 }
 
-#g-edit-permissions-form td {
-  background-image: none;
-}
-
-#g-edit-permissions-form fieldset {
-	border: 1px solid #ccc;
-}
-
 #g-permissions .g-denied,
 #g-permissions .g-allowed {
   text-align: center;
   vertical-align: middle;
 }
 
-#g-permissions .g-denied {
-  background-color: #fcc;
-}
-
-#g-permissions .g-allowed {
-  background-color: #cfc;
-}
-
 /* Move items ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
 #g-move ul {
diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index 44582a92..be802976 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -319,6 +319,23 @@ td {
   background-color: #fff;
 }
 
+/* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+#g-edit-permissions-form td {
+  background-image: none;
+}
+
+#g-edit-permissions-form fieldset {
+  border: 1px solid #ccc;
+}
+
+#g-permissions .g-denied {
+  background-color: #fcc;
+}
+
+#g-permissions .g-allowed {
+  background-color: #cfc;
+}
+
 /** *******************************************************************
  * 5) Navigation and menus
  *********************************************************************/
@@ -465,4 +482,4 @@ td {
 .rtl #g-footer #g-credits li {
   padding-left: 1.2em !important;
   padding-right: 0;
-}
\ No newline at end of file
+}