From d206ec16595a022f10955eb025fd5756512399a8 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Dec 2012 02:06:28 -0800 Subject: Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger --- docs/components.html | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index ac9dc91ce..b870c1f3f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1478,7 +1478,7 @@ - Important + Danger 6 @@ -1487,28 +1487,6 @@ <span class="badge badge-danger">6</span> - - - Info - - - 8 - - - <span class="badge badge-info">8</span> - - - - - Inverse - - - 10 - - - <span class="badge badge-inverse">10</span> - - -- cgit v1.2.3 From c063f7c9c26abad3d9ac605d70b60d86e4d79343 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Mon, 24 Dec 2012 02:08:45 -0800 Subject: Update docs to reflect latest on .clearfix --- 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 b870c1f3f..e528837da 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2116,7 +2116,7 @@ class="muted"

.clearfix

-

Clear the float on any element.

+

Clear the float on any element. Utilizes the micro clearfix as popularized by Nicollas Gallagher.

 class="clearfix"
-- cgit v1.2.3 From 3d04d9ba751c08ab7909ee6146719171609d5cf9 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 28 Dec 2012 19:24:13 -0600 Subject: Super lame typo on my part, sorry @necolas :) --- 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 e528837da..a8a71842f 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2116,7 +2116,7 @@ class="muted"

.clearfix

-

Clear the float on any element. Utilizes the micro clearfix as popularized by Nicollas Gallagher.

+

Clear the float on any element. Utilizes the micro clearfix as popularized by Nicolas Gallagher.

 class="clearfix"
-- cgit v1.2.3 From 7a3f078fb487323246ccf64460b7efaf7d478afc Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 12 Jan 2013 13:15:19 -0800 Subject: Remove parent div from pagination component * No more div.pagination; it's now just ul.pagination * No more .pagination-right or .pagination-centered * Sizes remain * Any further customization, such as alignment, should be done on the individual application or site level. --- docs/components.html | 171 +++++++++++++++++---------------------------------- 1 file changed, 57 insertions(+), 114 deletions(-) (limited to 'docs/components.html') diff --git a/docs/components.html b/docs/components.html index a8a71842f..8811a7e5e 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1189,29 +1189,25 @@

Standard pagination

Simple pagination inspired by Rdio, great for apps and search results. The large block is hard to miss, easily scalable, and provides large click areas.

- + 
-<div class="pagination">
-  <ul>
-    <li><a href="#">Prev</a></li>
-    <li><a href="#">1</a></li>
-    <li><a href="#">2</a></li>
-    <li><a href="#">3</a></li>
-    <li><a href="#">4</a></li>
-    <li><a href="#">Next</a></li>
-  </ul>
-</div>
+<ul class="pagination">
+  <li><a href="#">Prev</a></li>
+  <li><a href="#">1</a></li>
+  <li><a href="#">2</a></li>
+  <li><a href="#">3</a></li>
+  <li><a href="#">4</a></li>
+  <li><a href="#">Next</a></li>
+</ul>
@@ -1223,43 +1219,37 @@

Disabled and active states

Links are customizable for different circumstances. Use .disabled for unclickable links and .active to indicate the current page.

- -
-
-<div class="pagination">
-  <ul>
-    <li class="disabled"><a href="#">Prev</a></li>
-    <li class="active"><a href="#">1</a></li>
-    ...
-  </ul>
-</div>
+            
+          
+
+<ul class="pagination">
+  <li class="disabled"><a href="#">Prev</a></li>
+  <li class="active"><a href="#">1</a></li>
+  ...
+</ul>
 

           
You can optionally swap out active or disabled anchors for spans to remove click functionality while retaining intended styles.

 
-<div class="pagination">
-  <ul>
-    <li class="disabled"><span>Prev</span></li>
-    <li class="active"><span>1</span></li>
-    ...
-  </ul>
-</div>
+<ul class="pagination">
+  <li class="disabled"><span>Prev</span></li>
+  <li class="active"><span>1</span></li>
+  ...
+</ul>
 

 
           
Sizes

           
Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.

           

-