Merge branch '2.1.2-wip' of https://github.com/uberspeck/bootstrap into uberspeck-2.1.2-wip

1 files changed, 48 insertions, 7 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 22ba91b45..2cba1da9e 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4759,11 +4759,6 @@ input[type="submit"].btn.btn-mini {
   color: #999999;
 }
 
-.pagination {
-  height: 40px;
-  margin: 20px 0;
-}
-
 .pagination ul {
   display: inline-block;
   *display: inline;
@@ -4785,8 +4780,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;
@@ -4836,6 +4829,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;