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

2 files changed, 26 insertions, 8 deletions

diff --git a/lib/gallery.common.css b/lib/gallery.common.css
index 5ca69908..c80dc90f 100644
--- a/lib/gallery.common.css
+++ b/lib/gallery.common.css
@@ -12,7 +12,6 @@
  *  7)  Right to left language styles
  *
  *  @todo Update .g-message-block, don't force it to 100%, bad things happen is themes when you do.
- *  @todo Remove extra white space at the top of the add comment form, above the first field
  */
 
 /** *******************************************************************
@@ -41,7 +40,7 @@ form {
 
 fieldset {
   border: 1px solid #ccc;
-  padding: .4em 1em .8em 1em;
+  padding: 0 1em .8em 1em;
 }
 
 #g-banner fieldset,
@@ -52,7 +51,8 @@ fieldset {
 
 legend {
   font-weight: bold;
-  margin: 0 0 .4em .8em;
+  margin: 0;
+  padding: 0 .2em;
 }
 
 #g-banner legend,
@@ -99,7 +99,11 @@ input[type=radio] {
 
 form li {
   margin: 0;
-  padding: .3em 0;
+  padding: 0 0 .2em 0;
+}
+
+form ul {
+  margin-top: 0;
 }
 
 form ul ul {
@@ -125,13 +129,22 @@ input[type="reset"] {
   float: left;
 }
 
-/* Forms in dialogs ~~~~~~~~~~~~~~~~~~ */
+/* Forms in dialogs and panels ~~~~~~~~~ */
 
-#g-dialog form fieldset {
+#g-dialog ul li {
+  padding-bottom: .8em;
+}
+
+#g-dialog fieldset,
+#g-panel fieldset {
   border: none;
   padding: 0;
 }
 
+#g-panel legend {
+  display: none;
+}
+
 #g-dialog input.textbox,
 #g-dialog input[type=text],
 #g-dialog input[type=password],
@@ -549,7 +562,7 @@ div#g-action-status {
   width: 40%;
 }
 
-/* Dialogs ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+/* Dialogs and panels ~~~~~~~~~~~~~~~~~~ */
 
 #g-dialog {
   text-align: left;
@@ -563,6 +576,11 @@ div#g-action-status {
   margin: .4em 1em;
 }
 
+#g-panel {
+  display: none;
+  padding: 1em;
+}
+
 /* Inline layout  ~~~~~~~~~~ */
 
 .g-inline li {
diff --git a/lib/gallery.common.js b/lib/gallery.common.js
index da69e476..9aaac1ce 100644
--- a/lib/gallery.common.js
+++ b/lib/gallery.common.js
@@ -125,7 +125,7 @@
 
   // Initialize context menus
   $.fn.gallery_context_menu = function() {
-    if ($(".g-context-menu li").length) {  
+    if ($(".g-context-menu li").length) {
       var hover_target = ".g-context-menu";
       var in_progress = 0;
       $(hover_target + " *").removeAttr('title');