Merge branch 'production' of github.com:sinefunc/boughtstuff into pro…

…duction Conflicts: app/views/layout.haml
sinefunc · Mar 30, 2010 · 9b701a6 · 9b701a6
2 parents e50e3dc + 00c96df
commit 9b701a6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/views/layout.haml b/app/views/layout.haml
@@ -50,6 +50,4 @@
       feedback_widget_options.color = "#222";
       feedback_widget_options.style = "idea";
       var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);
-      </script>
-
-
+      </script>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
@@ -193,4 +193,4 @@ span.tool-tip a {color: #FFF;-moz-border-radius:3px;-webkit-border-radius:3px;bo
 .footer .sinefunc-brand a {padding-top: 36px; background: url(../images/sinefunc-brand.png) no-repeat; width: 176px; margin-bottom: 10px;}
 .footer .copyright {line-height: 36px;}
 
-#fdbk_tab {bottom: 55%; top: auto !important;}
+#fdbk_tab {bottom: 25%; top: auto !important;}