Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

…duction

Conflicts:
	app/views/layout.haml
  • Loading branch information...
commit 9b701a6fd3d5c8c02796d27c2fcbcdd71bc88b95 2 parents e50e3dc + 00c96df
@mindless mindless authored
Showing with 2 additions and 4 deletions.
  1. +1 −3 app/views/layout.haml
  2. +1 −1  public/stylesheets/application.css
View
4 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>
View
2  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;}
Please sign in to comment.
Something went wrong with that request. Please try again.