From 646870135baab13b7996ea5fb86c848af7b3e76c Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 26 Oct 2011 21:28:43 -0700 Subject: [PATCH] fix vertical position of dropdown menu in .tabs --- bootstrap.css | 4 ++-- bootstrap.min.css | 2 +- lib/patterns.less | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap.css b/bootstrap.css index 478ef0eb8..4ec61e92a 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Oct 26 21:19:44 PDT 2011 + * Date: Wed Oct 26 21:28:20 PDT 2011 */ /* Reset.less * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc). @@ -1635,7 +1635,7 @@ a.menu:after, .dropdown-toggle:after { .tabs > li > a { padding: 0 15px; margin-right: 2px; - line-height: 36px; + line-height: 34px; border: 1px solid transparent; -webkit-border-radius: 4px 4px 0 0; -moz-border-radius: 4px 4px 0 0; diff --git a/bootstrap.min.css b/bootstrap.min.css index b4c3cd585..fd79449f3 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -261,7 +261,7 @@ a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;conten .tabs,.pills{margin:0 0 18px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;} .tabs:after,.pills:after{clear:both;} .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;} -.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} +.tabs{border-color:#ddd;border-style:solid;border-width:0 0 1px;}.tabs>li{position:relative;margin-bottom:-1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:34px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;} .tabs .active>a,.tabs .active>a:hover{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;} .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;} .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;} diff --git a/lib/patterns.less b/lib/patterns.less index 22d2bc014..5f4192d89 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -349,7 +349,7 @@ a.menu:after, > a { padding: 0 15px; margin-right: 2px; - line-height: @baseline * 2; + line-height: (@baseline * 2) - 2; border: 1px solid transparent; .border-radius(4px 4px 0 0); &:hover {