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

1 files changed, 11 insertions, 9 deletions

diff --git a/themes/wind/css/screen.css b/themes/wind/css/screen.css
index d3e0f83c..fa1704b0 100644
--- a/themes/wind/css/screen.css
+++ b/themes/wind/css/screen.css
@@ -276,6 +276,10 @@ input[readonly] {
   width: 100%;
 }
 
+.g-short-form .submit {
+  padding: .3em .6em;
+}
+
 .g-short-form .textbox.g-error {
   border: 1px solid #f00;
   color: #f00;
@@ -284,7 +288,8 @@ input[readonly] {
 
 .g-short-form .g-cancel {
   display: block;
-  margin: .3em .8em;
+  margin: 0em .8em;
+  padding: .3em .6em;
 }
 
 #g-sidebar .g-short-form li {
@@ -470,6 +475,7 @@ td {
 }
 
 #g-content .g-photo h2,
+#g-content .g-movie h2,
 #g-content .g-item .g-metadata {
   display: none;
   margin-bottom: .6em;
@@ -525,7 +531,7 @@ td {
 }
 
 #g-item img.g-resize,
-#g-item a.g-movie {
+#g-item .g-movie {
   display: block;
   margin: 0 auto;
 }
@@ -1038,7 +1044,9 @@ div#g-action-status {
 }
 
 #g-dialog .g-cancel {
-  margin: .4em 1em;
+  margin: 0 .3em;
+  float: left;
+  padding: .2em;
 }
 
 #g-panel {
@@ -1057,9 +1065,3 @@ div#g-action-status {
 .g-inline li.g-first {
   margin-left: 0;
 }
-
-/* Autocomplete  ~~~~~~~~~~ */
-
-.ac_loading {
-  background: white url('../images/loading-small.gif') right center no-repeat !important;
-}