use variable for navbar text line-height

author Mark Otto <markotto@twitter.com>

Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)

committer Mark Otto <markotto@twitter.com>

Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)
author Mark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)
committer Mark Otto <markotto@twitter.com>
Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip

index ed0de7504fa243b0c2ac3310a9de7ad9d78f3996..8ebb10d4b1e7855dc46dadf652d9a3a4f4aa02e0 100644 (file)

Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ
diff --git a/docs/base-css.html b/docs/base-css.html

index 319510bb31fa851eea5c296705e6439b5d5f5277..6f1664a829a37081eced12ec7503035921fb8643 100644 (file)
--- 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 4e75190710737b352d3fd67458a511eab3878dc4..1d06036081a93da25aac55d769f8f4464306f946 100644 (file)
--- 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 1b489e916459d7cda475792835efb975317732bd..efee3ce7acd88697e322b3f87334215cc9836277 100644 (file)
--- 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 84051511dcb5536ee736f09dac83b1a3ccde9ca5..947f635b1a3274651d15b11e632b23de8085105b 100644 (file)
--- 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 b86554a4cf8036b3bc17f5e774cfbbcd13939bf9..1b0b0e9d585845aaa2d04783c69cf1f21ff49876 100644 (file)
--- 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 d1c9db0a7bbcadb315835cd3ae907c7162674797..a90562767e32186d12605d2cbbf83a552348a128 100644 (file)
--- 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 b24a4334ad6c8e3fe7fad928a447752f356b5d0c..f8e4d9b33fbee516e98ba9037e7201a94a0ca4de 100644 (file)
--- 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 33bd7b2804ddf9c0bfe53c11a7d4fbe976e8e6fa..29491c118bfddfb24ba0cbd8ab966dbd17d995d2 100644 (file)
--- 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 e2ece9522aeba586b2ad1dafbc80016f485ebb70..01dd02aeecd388ca4ddc9b2c3183377518a5bb41 100644 (file)
--- 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 fbac53f38314bcc8400c7e40103e55dae70bbd4a..8d0822473e1b59df2df7b84529828120b2029b81 100644 (file)
--- 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,
author	Mark Otto <markotto@twitter.com>
	Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)
committer	Mark Otto <markotto@twitter.com>
	Mon, 12 Mar 2012 00:53:17 +0000 (17:53 -0700)
docs/assets/bootstrap.zip		patch \| blob \| blame \| history
docs/base-css.html		patch \| blob \| blame \| history
docs/components.html		patch \| blob \| blame \| history
docs/download.html		patch \| blob \| blame \| history
docs/examples.html		patch \| blob \| blame \| history
docs/index.html		patch \| blob \| blame \| history
docs/javascript.html		patch \| blob \| blame \| history
docs/less.html		patch \| blob \| blame \| history
docs/scaffolding.html		patch \| blob \| blame \| history
docs/upgrading.html		patch \| blob \| blame \| history
less/navbar.less		patch \| blob \| blame \| history