From 7154e378b241f753491c1aaf4aba310b7f0f179d Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Sun, 11 Mar 2012 17:53:17 -0700
Subject: [PATCH] use variable for navbar text line-height
---
docs/assets/bootstrap.zip | Bin 55119 -> 55119 bytes
docs/base-css.html | 4 ++--
docs/components.html | 4 ++--
docs/download.html | 4 ++--
docs/examples.html | 4 ++--
docs/index.html | 4 ++--
docs/javascript.html | 4 ++--
docs/less.html | 4 ++--
docs/scaffolding.html | 4 ++--
docs/upgrading.html | 4 ++--
less/navbar.less | 2 +-
11 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index ed0de7504fa243b0c2ac3310a9de7ad9d78f3996..8ebb10d4b1e7855dc46dadf652d9a3a4f4aa02e0 100644
GIT binary patch
delta 467
zcmX@Vj`{pLW}X0VW)?065Lnzdkw=m3lSi!oSC7dLuLyI&B$o6|3{YkJ0+*QB$H4>?
zn_&wU`{J?jb~`6fU~&qVBUEJbYOa6mAfeSlMr@yf8b5h#ek_z}0uu6bHv_Bs?6JAa
zeWxK4(AoeQ{><ET{m>9j24;l)AZr%)P42C920IF9#I?#w0gzB&mn}?aN>{Z2)6%}l
zg0ofFzM{Esa>Q%{sIxcs&5lw8se84@1gdVc%HAoWAk%hT(r5Yv^06$?d6TZnOjf%r
z&h!N&AU=8DRW^{D<1TxniJZFZk0xSu#ewNFimusLTp(&>f!0jAY7DUjVkpqwkgI`c
oBFC<J!(0M%s?jwgCU8u^ozZ&D4%t$mnkUzsAZmmsTVEFe0LHG<0RR91
delta 467
zcmX@Vj`{pLW}X0VW)?065J>Bo$fL++ZyW3HXgm4g6=5zUi2zkL2e`z<J`N_J;u*GJ
zF$dd?x7#_H(mN)na5=I$0#!NKZeGpxj~%FH@@gR?up)cg&5wmLO+Z3^?q*PZo4ee1
z8iGs;km1kFP1g?%;bdS&*blL0a&M(G*ik?uu2ohFfQ$(2vV{pv>8ch0*)2F*1#CCO
z=^(8@!HC%gP{GZ8v!fJ2La+9iz=TxxP7wu}w(F8UlRe1CvOwOXt1^?-E{iicfCR)R
z@4LzdQWAIB8(9Qs&Z*1(Oklg<YOJm}AgclDntjCuA_6hk7-9=tL&()YG?8Ohy<si^
dT48j}2-ymtNb5B_G?6FQoFF2?ldZ3d007xSvEu*$
diff --git a/docs/base-css.html b/docs/base-css.html
index 319510bb31..6f1664a829 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 4e75190710..1d06036081 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 1b489e9164..efee3ce7ac 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 84051511dc..947f635b1a 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 b86554a4cf..1b0b0e9d58 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 d1c9db0a7b..a90562767e 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 b24a4334ad..f8e4d9b33f 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 33bd7b2804..29491c118b 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 e2ece9522a..01dd02aeec 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 fbac53f383..8d0822473e 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,
--
GitLab