]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Move `hr` to scaffolding.less (out of type.less) and simplify styles
authorMark Otto <otto@github.com>
Fri, 5 Jul 2013 19:21:05 +0000 (14:21 -0500)
committerMark Otto <otto@github.com>
Fri, 5 Jul 2013 19:21:05 +0000 (14:21 -0500)
docs/assets/css/bootstrap.css
less/scaffolding.less
less/type.less

index 55888527c66eb1aef3360f04f903dd643693273e..c11879433852c97ad79ada4cd4ee7768034228c1 100644 (file)
@@ -342,6 +342,13 @@ img {
   border-radius: 500px;
 }
 
+hr {
+  margin-top: 20px;
+  margin-bottom: 20px;
+  border: 0;
+  border-top: 1px solid #eeeeee;
+}
+
 p {
   margin: 0 0 10px;
 }
@@ -590,14 +597,6 @@ dd {
   clear: both;
 }
 
-hr {
-  margin: 20px 0;
-  border: 0;
-  border-top: 1px solid #eeeeee;
-  border-bottom: 1px solid #fff;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.5);
-}
-
 abbr[title],
 abbr[data-original-title] {
   cursor: help;
index 88b6c7c6e6f87f3e0397c120fd996c196b102a45..8fc3a2360efd14bd91ae0a76cc1ac51fcf34b7ae 100644 (file)
@@ -81,3 +81,15 @@ img {
 .img-circle {
   border-radius: 500px; // crank the border-radius so it works with most reasonably sized images
 }
+
+
+// Horizontal rules
+// -------------------------
+
+hr {
+  margin-top:    @line-height-computed;
+  margin-bottom: @line-height-computed;
+  border: 0;
+  border-top: 1px solid @hr-border;
+}
+
index 9892d558901f2cbba46a9232e2a3e01e5b100377..2f1f42ee3a3d0c83b21ca74b28ac890d72c19e4c 100644 (file)
@@ -164,15 +164,6 @@ dd {
 // MISC
 // ----
 
-// Horizontal rules
-hr {
-  margin: @line-height-computed 0;
-  border: 0;
-  border-top: 1px solid @hr-border;
-  border-bottom: 1px solid #fff;
-  border-bottom: 1px solid rgba(255,255,255,.5);
-}
-
 // Abbreviations and acronyms
 abbr[title],
 // Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257