diff options
| author | Mark Otto <[email protected]> | 2012-03-11 17:53:17 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-11 17:53:17 -0700 |
| commit | 7154e378b241f753491c1aaf4aba310b7f0f179d (patch) | |
| tree | 913686fbbf48da97c160d1449aa73197a4932cf0 | |
| parent | 95cb6f07a8fc2410873c59addd3f1aad948e54fd (diff) | |
| download | bootstrap-7154e378b241f753491c1aaf4aba310b7f0f179d.tar.xz bootstrap-7154e378b241f753491c1aaf4aba310b7f0f179d.zip | |
use variable for navbar text line-height
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55119 -> 55119 bytes | |||
| -rw-r--r-- | docs/base-css.html | 4 | ||||
| -rw-r--r-- | docs/components.html | 4 | ||||
| -rw-r--r-- | docs/download.html | 4 | ||||
| -rw-r--r-- | docs/examples.html | 4 | ||||
| -rw-r--r-- | docs/index.html | 4 | ||||
| -rw-r--r-- | docs/javascript.html | 4 | ||||
| -rw-r--r-- | docs/less.html | 4 | ||||
| -rw-r--r-- | docs/scaffolding.html | 4 | ||||
| -rw-r--r-- | docs/upgrading.html | 4 | ||||
| -rw-r--r-- | less/navbar.less | 2 |
11 files changed, 19 insertions, 19 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex ed0de7504..8ebb10d4b 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/base-css.html b/docs/base-css.html index 319510bb3..6f1664a82 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/components.html b/docs/components.html index 4e7519071..1d0603608 100644 --- a/docs/components.html +++ b/docs/components.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/download.html b/docs/download.html index 1b489e916..efee3ce7a 100644 --- a/docs/download.html +++ b/docs/download.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/examples.html b/docs/examples.html index 84051511d..947f635b1 100644 --- a/docs/examples.html +++ b/docs/examples.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/index.html b/docs/index.html index b86554a4c..1b0b0e9d5 100644 --- a/docs/index.html +++ b/docs/index.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/javascript.html b/docs/javascript.html index d1c9db0a7..a90562767 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/less.html b/docs/less.html index b24a4334a..f8e4d9b33 100644 --- a/docs/less.html +++ b/docs/less.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 33bd7b280..29491c118 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/docs/upgrading.html b/docs/upgrading.html index e2ece9522..01dd02aee 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -20,9 +20,9 @@ <!-- Le fav and touch icons --> <link rel="shortcut icon" href="assets/ico/favicon.ico"> - <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> - <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"> + <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"> + <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"> </head> <body data-spy="scroll" data-target=".subnav" data-offset="50"> diff --git a/less/navbar.less b/less/navbar.less index fbac53f38..8d0822473 100644 --- a/less/navbar.less +++ b/less/navbar.less @@ -75,7 +75,7 @@ // Plain text in topbar .navbar-text { margin-bottom: 0; - line-height: 40px; + line-height: @navbarHeight; } // Buttons in navbar .btn, |