From 61823dbff1377443203f6ef6a98b8202b57abb29 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 5 Jul 2013 14:21:05 -0500 Subject: [PATCH] Move `hr` to scaffolding.less (out of type.less) and simplify styles --- docs/assets/css/bootstrap.css | 15 +++++++-------- less/scaffolding.less | 12 ++++++++++++ less/type.less | 9 --------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 55888527c6..c118794338 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -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; diff --git a/less/scaffolding.less b/less/scaffolding.less index 88b6c7c6e6..8fc3a2360e 100644 --- a/less/scaffolding.less +++ b/less/scaffolding.less @@ -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; +} + diff --git a/less/type.less b/less/type.less index 9892d55890..2f1f42ee3a 100644 --- a/less/type.less +++ b/less/type.less @@ -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