Merge branch 'master' of git@github.com:talmdal/gallery3 into talmdal_branch

1 files changed, 13 insertions, 6 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 55839c57..ecae2bb2 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -718,7 +718,7 @@ form .gError,
   font-weight: bold;
 }
 
-#gAddPhotos .gBreadcrumbs {
+#gDialog .gBreadcrumbs li {
   font-size: .9em;
 }
 
@@ -901,6 +901,10 @@ form .gError,
   display: none;
 }
 
+#gDialog p {
+	margin: 0;
+}
+
 /* jQuery UI ThemeRoller buttons */
 
 .gButtonLink {
@@ -1001,6 +1005,14 @@ form .gError,
 
 /* Permissions ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
 
+#gEditPermissionForm {
+	clear: both;
+}
+#gEditPermissionForm fieldset {
+	border: 1px solid #cccccc;
+	padding: 0;
+}
+
 #gPermissions .gDenied,
 #gPermissions .gAllowed {
   text-align: center;
@@ -1022,11 +1034,6 @@ form .gError,
   display: inline-block;
 }
 
-#gAddPhotos p {
-  margin: 0;
-  padding: 0;
-}
-
 #gAddPhotosCanvas {
   height: 325px;
   width: 450px;