From 8b696ad0b5fda07599bc3a865b1f2659345add3b Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 9 Jul 2012 00:14:35 -0700 Subject: [PATCH] fix text in docs about default font-size and line-height --- docs/assets/css/bootstrap.css | 1 + docs/templates/pages/base-css.mustache | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 5af92fad11..61398812e1 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -5198,6 +5198,7 @@ a.badge:hover { .carousel { position: relative; + display: table; margin-bottom: 20px; line-height: 1; } diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 8985e7c69f..a474ac8614 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -54,7 +54,7 @@ {{! Body copy }}

{{_i}}Body copy{{/i}}

-

{{_i}}Bootstrap's global default font-size is 13px, with a line-height of 18px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}

+

{{_i}}Bootstrap's global default font-size is 14px, with a line-height of 20px. This is applied to the <body> and all paragraphs. In addition, <p> (paragraphs) receive a bottom margin of half their line-height (9px by default).{{/i}}

Nullam quis risus eget urna mollis ornare vel eu leo. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nullam id dolor id nibh ultricies vehicula.

Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec ullamcorper nulla non metus auctor fringilla. Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit. Donec ullamcorper nulla non metus auctor fringilla.