clean up integration merge

01e84648 · Randall Leeds · d99c3c6f · 01e84648
Commit 01e84648 authored May 17, 2012 by Randall Leeds
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

app.scss hypothesis/sass/app.scss +5 -1

No files found.
--- a/hypothesis/sass/app.scss
+++ b/hypothesis/sass/app.scss
@@ -51,7 +51,6 @@ html {
  @include single-transition(right, 0.6s, ease-in-out);
  position: absolute;
  width: auto;
-  height: 100%;
  right: 0;
  left: 0;
 }
@@ -187,6 +186,11 @@ $iconset: iconset_wireframe;
  }
 }

+.hyp-sidebar.collapse {
+  width: 0;
+  margin-left: 0;
+}
+
 //LOGO
 .hypothesis-logo {
  font-size: 2em;