Upgrade to bootstrap 2.1.0 & fix regressions, upgrade jQuery assets, …

…remove survey from UI, update gitignore.
aroman · Aug 22, 2012 · f6d9960 · f6d9960
1 parent f81cdeb
commit f6d9960
Show file tree

Hide file tree

Showing 9 changed files with 2,550 additions and 11,071 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_STORE*
+.DS_Store*
 Thumbs.db
 node_modules/
diff --git a/static/css/app.css b/static/css/app.css
@@ -1,12 +1,33 @@
 /* Copyright (C) 2012 Avi Romanoff <aviromanoff at gmail.com> */
 
-/* Make the background slightly off-white */
-html, body {
-  background-color: #FAFAFA;
+/* BUGFIX: 2.0.4 -> 2.1.0
+  Icons inside .btn-mini are misaligned by 1px
+  https://github.com/twitter/bootstrap/pull/4522 */
+.btn-mini [class^="icon-"] {
+  margin-top: -1px;
+}
+
+/* REGRESSION FIX: 2.0.4 -> 2.1.0
+  header text is too big */
+h2 {
+  font-size: 24px;
+  line-height: 36px;
+}
+h3 {
+  font-size: 18px;
+  line-height: 27px;
+}
+
+/* REGRESSION FIX: 2.0.4 -> 2.1.0
+  Headers have 10px padding */
+h1, h2, h3, h4, h5, h6 {
+  margin: 0;
 }
 
-/* Make the body not overlap with the topbar */
 body {
+  background-color: #FAFAFA;
+  font-size: 13px;
+  line-height: 18px;
   padding-top: 60px;
   padding-bottom: 40px;
 }