From 2c8eff0eecb92b7e1b585afe3b59bf907a3e3a78 Mon Sep 17 00:00:00 2001 From: Brian Campbell Date: Wed, 12 Sep 2012 14:10:03 -0600 Subject: Updated pagination to support .pagination-large, .pagination-small, .pagination-mini matching button sizes. Updated related docs. --- docs/assets/css/bootstrap.css | 55 +++++++++++++++--- docs/components.html | 99 ++++++++++++++++++++++++++++++++ docs/templates/pages/components.mustache | 99 ++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+), 7 deletions(-) (limited to 'docs') diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 37700b36c..8e95cd4be 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4735,11 +4735,6 @@ input[type="submit"].btn.btn-mini { color: #999999; } -.pagination { - height: 40px; - margin: 20px 0; -} - .pagination ul { display: inline-block; *display: inline; @@ -4761,8 +4756,6 @@ input[type="submit"].btn.btn-mini { .pagination ul > li > a, .pagination ul > li > span { float: left; - padding: 0 14px; - line-height: 38px; text-decoration: none; background-color: #ffffff; border: 1px solid #dddddd; @@ -4812,6 +4805,54 @@ input[type="submit"].btn.btn-mini { text-align: right; } +.pagination { + height: 30px; + margin: 17px 0; + font-size: 14px; +} + +.pagination ul > li > a, +.pagination ul > li > span { + padding: 0 12px; + line-height: 28px; +} + +.pagination-large { + height: 38px; + margin: 20px 0; + font-size: 16px; +} + +.pagination-large ul > li > a, +.pagination-large ul > li > span { + padding: 0 15px; + line-height: 36px; +} + +.pagination-small { + height: 26px; + margin: 15px 0; + font-size: 12px; +} + +.pagination-small ul > li > a, +.pagination-small ul > li > span { + padding: 0 10px; + line-height: 22px; +} + +.pagination-mini { + height: 23px; + margin: 10px 0; + font-size: 11px; +} + +.pagination-mini ul > li > a, +.pagination-mini ul > li > span { + padding: 0 8px; + line-height: 21px; +} + .pager { margin: 20px 0; text-align: center; diff --git a/docs/components.html b/docs/components.html index 3272f29d0..487dceac4 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1473,6 +1473,105 @@
+

Sizes

+

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

+
+ + + + +
+
+<div class="pagination pagination-large">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-small">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-mini">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+
+ + +
+ +

Options

Disabled and active states

diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 95ac1ce4c..e3f8474a5 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1402,6 +1402,105 @@
+

{{_i}}Sizes{{/i}}

+

{{_i}}Fancy larger or smaller pagination? Add .pagination-large, .pagination-small, or .pagination-mini for additional sizes.{{/i}}

+
+ + + + +
+
+<div class="pagination pagination-large">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-small">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+<div class="pagination pagination-mini">
+  <ul>
+    <li><a href="#">«</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="#">5</a></li>
+    <li><a href="#">»</a></li>
+  </ul>
+</div>
+
+ + +
+ +

{{_i}}Options{{/i}}

{{_i}}Disabled and active states{{/i}}

-- cgit v1.2.3