rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of http://git.local.twitter.com/bootstrap

Browse source
This commit is contained in:
Mark Otto 2011-06-29 17:11:02 -07:00
commit cddc565d07
9 changed files with 86 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

23
lib/type.less
View file

@ -1,11 +1,10 @@
/*
* Typography.less
/* Typography.less
* Headings, body text, lists, code, and more for a versatile and durable typography system
*/
* ---------------------------------------------------------------------------------------- */
/* Body text
-------------------------------------------------- */
// Body text
// ---------
p {
#font > .shorthand(normal,@basefont,@baseline);
@ -16,9 +15,8 @@ p {
}
}
/* Headings
-------------------------------------------------- */
// Headings
// --------
h1, h2, h3, h4, h5, h6 {
font-weight: bold;
@ -68,8 +66,8 @@ h6 {
/* Colors
-------------------------------------------------- */
// Colors
// ------
// Unordered and Ordered lists
ul, ol {
@ -110,9 +108,8 @@ dl {
}
}
/* Misc
-------------------------------------------------- */
// Misc
// ----
// Horizontal rules
hr {