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

2 files changed, 7 insertions, 4 deletions

diff --git a/modules/user/css/progressImg1.png b/modules/user/css/progressImg1.png
deleted file mode 100644
index a9093647..00000000
--- a/modules/user/css/progressImg1.png
+++ /dev/null
diff --git a/modules/user/css/user.css b/modules/user/css/user.css
index 67d4f196..77e0b44b 100644
--- a/modules/user/css/user.css
+++ b/modules/user/css/user.css
@@ -12,12 +12,11 @@
 }
 
 li.g-group {
-  float: left;
   display: block;
-  width: 200px;
   border: 1px solid gray;
-  padding: 0;
   margin: 0 1em 1em 0;
+  padding: 0;
+  width: 200px;
 }
 
 li.g-group h4 {
@@ -55,8 +54,12 @@ li.g-default-group h4, li.g-default-group .g-user {
   color: gray;
 }
 
+.g-group.ui-droppable {
+  padding: 0 !important;
+}
+
 .g-password-strength0 {
-  background: url(progressImg1.png) no-repeat 0 0;
+  background: url(../images/progressImg1.png) no-repeat 0 0;
   width: 138px;
   height: 7px;
 }