paper: fix btn-group margin, closes #400

09e07bbe · Thomas Park · c242e32e · 09e07bbe · 09e07bbe · 09e07bbe
Commit 09e07bbe authored Feb 03, 2015 by Thomas Park
Showing with 49 additions and 1 deletion

paper/_bootswatch.scss paper/_bootswatch.scss +18 -0

paper/bootstrap.css paper/bootstrap.css +12 -0

paper/bootstrap.min.css paper/bootstrap.min.css +1 -1

paper/bootswatch.less paper/bootswatch.less +18 -0

No files found.
--- a/paper/_bootswatch.scss
+++ b/paper/_bootswatch.scss
@@ -86,6 +86,24 @@
  }
 }

+.btn-group {
+  .btn + .btn,
+  .btn + .btn-group,
+  .btn-group + .btn,
+  .btn-group + .btn-group {
+    margin-left: 0;
+  }
+
+  &-vertical {
+    > .btn + .btn,
+    > .btn + .btn-group,
+    > .btn-group + .btn,
+    > .btn-group + .btn-group {
+      margin-top: 0;
+    }
+  }
+}
+
 // Typography =================================================================

 body {

--- a/paper/bootstrap.css
+++ b/paper/bootstrap.css
@@ -6781,6 +6781,18 @@ button.close {
 .btn-default.disabled {
  border: 1px solid #eeeeee;
 }
+.btn-group .btn + .btn,
+.btn-group .btn + .btn-group,
+.btn-group .btn-group + .btn,
+.btn-group .btn-group + .btn-group {
+  margin-left: 0;
+}
+.btn-group-vertical > .btn + .btn,
+.btn-group-vertical > .btn + .btn-group,
+.btn-group-vertical > .btn-group + .btn,
+.btn-group-vertical > .btn-group + .btn-group {
+  margin-top: 0;
+}
 body {
  -webkit-font-smoothing: antialiased;
  letter-spacing: .1px;

--- a/paper/bootstrap.min.css
+++ b/paper/bootstrap.min.css
--- a/paper/bootswatch.less
+++ b/paper/bootswatch.less
@@ -86,6 +86,24 @@
  }
 }

+.btn-group {
+  .btn + .btn,
+  .btn + .btn-group,
+  .btn-group + .btn,
+  .btn-group + .btn-group {
+    margin-left: 0;
+  }
+
+  &-vertical {
+    > .btn + .btn,
+    > .btn + .btn-group,
+    > .btn-group + .btn,
+    > .btn-group + .btn-group {
+      margin-top: 0;
+    }
+  }
+}
+
 // Typography =================================================================

 body {