From a27bf30f0d7a42f356d661db9835710bc8917067 Mon Sep 17 00:00:00 2001 From: Quy Ton Date: Thu, 20 Dec 2012 21:38:53 -0800 Subject: Miscellaneous changes to docs --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index bd528866c..10ffd2e0c 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2488,7 +2488,7 @@ 

<button class="close">&times;</button>
-

iOS devices require an href="#" for click events if you would rather use an anchor.

+

iOS devices require an href="#" for click events if you would rather use an anchor.

<a class="close" href="#">&times;</a>

Helper classes

-- cgit v1.2.3 From 88e816956a731c9e3284c55a7be0c81b447c2601 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 11 Jan 2013 20:52:39 -0800 Subject: Fixes #6552: example fix for button group --- docs/components.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 10ffd2e0c..751418816 100644 --- a/docs/components.html +++ b/docs/components.html @@ -272,9 +272,9 @@ 
 <div class="btn-group">
-  <button class="btn">1</button>
-  <button class="btn">2</button>
-  <button class="btn">3</button>
+  <button class="btn">Left</button>
+  <button class="btn">Middle</button>
+  <button class="btn">Right</button>
 </div>
-- cgit v1.2.3 From a7231854c91399aafb371ccdf2b930037a7ac5ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 00:33:12 -0800 Subject: Address #6459 and add mention of disabled links in dropdowns to le docs --- docs/components.html | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 751418816..bbb0dc39d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -161,6 +161,25 @@ <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dLabel"> ... </ul> + + +

Disabled menu options

+

Add .disabled to a <li> in the dropdown to disable the link.

+
+
+ +
+
+
+<ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
+  <li><a tabindex="-1" href="#">Regular link</a></li>
+  <li><a tabindex="-1" href="#">Disabled link</a></li>
+  <li><a tabindex="-1" href="#">Another link</a></li>
+</ul>

Sub menus on dropdowns

-- cgit v1.2.3 From f9ee99cf6febd0b59ee95aa1866a3c1eb5c61320 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 14 Jan 2013 00:11:55 -0800 Subject: Upgrade to newest HTML5 shiv, and make it a local dependency rather than CDNing --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index bbb0dc39d..7a670998d 100644 --- a/docs/components.html +++ b/docs/components.html @@ -15,7 +15,7 @@ -- cgit v1.2.3 From 60bb95e611b6a096e5d50263e278b4be92e7468f Mon Sep 17 00:00:00 2001 From: Yohn Date: Wed, 16 Jan 2013 07:45:31 -0500 Subject: adding class to example code --- docs/components.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index 7a670998d..e8b74cf82 100644 --- a/docs/components.html +++ b/docs/components.html @@ -177,7 +177,7 @@ 
 <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
   <li><a tabindex="-1" href="#">Regular link</a></li>
-  <li><a tabindex="-1" href="#">Disabled link</a></li>
+  <li class="disabled"><a tabindex="-1" href="#">Disabled link</a></li>
   <li><a tabindex="-1" href="#">Another link</a></li>
 </ul>
-- cgit v1.2.3 From f20c3368e41cb654dfcb568968b171c45de22127 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 30 Jan 2013 17:42:03 -0800 Subject: Update pagination example HTML to match examples --- docs/components.html | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index e8b74cf82..849d1f9c3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1515,6 +1515,7 @@ <li><a href="#">2</a></li> <li><a href="#">3</a></li> <li><a href="#">4</a></li> + <li><a href="#">5</a></li> <li><a href="#">Next</a></li> </ul> </div> @@ -1544,7 +1545,7 @@ 
 <div class="pagination">
   <ul>
-    <li class="disabled"><a href="#">Prev</a></li>
+    <li class="disabled"><a href="#">&laquo;</a></li>
     <li class="active"><a href="#">1</a></li>
     ...
   </ul>
@@ -1554,7 +1555,7 @@
 
 <div class="pagination">
   <ul>
-    <li class="disabled"><span>Prev</span></li>
+    <li class="disabled"><span>&laquo;</span></li>
     <li class="active"><span>1</span></li>
     ...
   </ul>
-- 
cgit v1.2.3


From 2fa77bf197050a385e479e1b2e8f61d634499505 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 5 Feb 2013 22:46:45 -0800
Subject: Update link to changelog

---
 docs/components.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/components.html')

diff --git a/docs/components.html b/docs/components.html
index 849d1f9c3..7b960543b 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -2589,7 +2589,7 @@ class="clearfix"
           
  • ·
    • 
           
  • Issues
    • 
           
  • ·
    • 
-          
  • Roadmap and changelog
    • 
+          
  • Changelog
    • 
         
       
     
-- 
cgit v1.2.3