Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

1 files changed, 5 insertions, 17 deletions

diff --git a/less/type.less b/less/type.less
index 9a6811e3d..a9a7e189f 100644
--- a/less/type.less
+++ b/less/type.less
@@ -23,8 +23,6 @@ p {
 // Ex: 14px base font * 85% = about 12px
 small   { font-size: 85%; }
 
-strong  { font-weight: bold; }
-em      { font-style: italic; }
 cite    { font-style: normal; }
 
 // Utility classes
@@ -54,6 +52,7 @@ a.text-success:focus { color: darken(@state-success-text, 10%); }
 
 h1, h2, h3, h4, h5, h6,
 .h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: @headings-font-family;
   font-weight: @headings-font-weight;
   line-height: @headings-line-height;
   small {
@@ -108,12 +107,10 @@ ul,
 ol {
   margin-top: 0;
   margin-bottom: (@line-height-computed / 2);
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
+  ul,
+  ol{
+    margin-bottom: 0;
+  }
 }
 
 // List options
@@ -165,15 +162,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