make accordion links block level

diff --git a/bootstrap.css b/bootstrap.css
index 4e7316558633fb7bc79bdeaac70f37493fefb533..8db6a82e63a503ccac061df89fa7b36fb7de59f8 100644 (file)
--- 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: Thu Jan 26 11:09:38 PST 2012
+ * Date: Thu Jan 26 13:56:25 PST 2012
  */
 article,
 aside,
@@ -2518,6 +2518,9 @@ table .span12 {
   padding: 7px 9px 7px;
   font-size: 11px;
 }
+.btn.small .icon {
+  margin-top: -2px;
+}
 button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   padding: 0;
   border: 0;
@@ -2616,6 +2619,9 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
   opacity: 0.75;
   filter: alpha(opacity=75);
 }
+.btn.small .caret {
+  margin-top: 4px;
+}
 .alert {
   padding: 8px 35px 8px 14px;
   margin-bottom: 18px;
@@ -2880,9 +2886,12 @@ a.thumbnail:hover {
   border-radius: 4px;
 }
 .accordion-heading {
-  padding: 8px 15px;
   border-bottom: 0;
 }
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
 .accordion-body {
   margin-bottom: 2px;
 }

diff --git a/bootstrap.min.css b/bootstrap.min.css
index 6f22405e6903345fce1641bb7fa9032cc437cfe4..191784b436bd5419bb956442911e22f8d6c6766a 100644 (file)
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -471,6 +471,7 @@ table .span12{float:none;width:924px;margin-left:0;}
 .btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
 .btn.large{padding:9px 14px 9px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
 .btn.small{padding:7px 9px 7px;font-size:11px;}
+.btn.small .icon{margin-top:-2px;}
 button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;border:0;}
 .btn-group{position:relative;*zoom:1;}.btn-group:before,.btn-group:after{display:table;content:"";}
 .btn-group:after{clear:both;}
@@ -487,6 +488,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
 .btn .caret{margin-top:6px;margin-left:0;}
 .primary .caret,.danger .caret,.info .caret,.success .caret{border-top-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.btn.small .caret{margin-top:4px;}
 .alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #f3edd2;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
 .alert,.alert-heading{color:#c09853;}
 .alert .close{position:relative;right:-21px;line-height:18px;}
@@ -523,7 +525,8 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .progress.info.striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
 .accordion{margin-bottom:18px;}
 .accordion-group{background-color:#f5f5f5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
-.accordion-heading{padding:8px 15px;border-bottom:0;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
 .accordion-body{margin-bottom:2px;}
 .accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
 .carousel{position:relative;line-height:1;}

diff --git a/docs/javascript.html b/docs/javascript.html
index 63881d2c9a970bedb292418b476945a0299b718e..2bd5bbd05cc746198b1ebf933fe968a5bdb2c171 100644 (file)
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1054,7 +1054,7 @@ $('#my-alert').bind('closed', function () {
           <div class="accordion" id="accordion2">
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
                   Collapsible Group Item #1
                 </a>
               </div>
@@ -1066,7 +1066,7 @@ $('#my-alert').bind('closed', function () {
             </div>
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
                   Collapsible Group Item #2
                 </a>
               </div>
@@ -1078,7 +1078,7 @@ $('#my-alert').bind('closed', function () {
             </div>
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
                   Collapsible Group Item #3
                 </a>
               </div>

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 941c6b485a427f9dc80c699534c5f34d3af21ecc..59b8a03d6b5682bb917f129b58b31503f2c316d8 100644 (file)
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -989,7 +989,7 @@ $('#my-alert').bind('closed', function () {
           <div class="accordion" id="accordion2">
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseOne">
                   {{_i}}Collapsible Group Item #1{{/i}}
                 </a>
               </div>
@@ -1001,7 +1001,7 @@ $('#my-alert').bind('closed', function () {
             </div>
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseTwo">
                   {{_i}}Collapsible Group Item #2{{/i}}
                 </a>
               </div>
@@ -1013,7 +1013,7 @@ $('#my-alert').bind('closed', function () {
             </div>
             <div class="accordion-group">
               <div class="accordion-heading">
-                <a data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
+                <a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion2" href="#collapseThree">
                   {{_i}}Collapsible Group Item #3{{/i}}
                 </a>
               </div>

diff --git a/lib/accordion.less b/lib/accordion.less
index a57683e7b08d549313d74229925254160b9b3726..1ebd5b1a1a7c0b9fa37d8d48b1f93f4d14697107 100644 (file)
--- a/lib/accordion.less
+++ b/lib/accordion.less
@@ -13,9 +13,12 @@
   .border-radius(4px);
 }
 .accordion-heading {
-  padding: 8px 15px;
   border-bottom: 0;
 }
+.accordion-heading .accordion-toggle {
+  display: block;
+  padding: 8px 15px;
+}
 .accordion-body {
   margin-bottom: 2px;
 }