aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-09-18 20:56:20 -0700
committerMark Otto <[email protected]>2012-09-18 20:56:20 -0700
commit2769241aeb5e9eba4a34ddbd9d495f7f8271e360 (patch)
tree5c2cb4a217e7b3e6e7d8d457b69e9683ecefbf12 /docs/assets/css
parent37460e58d3139ef43425583b50d967341ec43930 (diff)
downloadbootstrap-2769241aeb5e9eba4a34ddbd9d495f7f8271e360.tar.xz
bootstrap-2769241aeb5e9eba4a34ddbd9d495f7f8271e360.zip
add new vars for common font-sizes and paddings with large, small, and mini components; resize pagination and buttons to better match each other
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css66
1 files changed, 27 insertions, 39 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2cba1da9e..aa950d24c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3159,10 +3159,15 @@ button.close {
box-shadow: none;
}
+.btn-large,
+.btn-small,
+.btn-mini {
+ line-height: 1;
+}
+
.btn-large {
- padding: 9px 14px;
- font-size: 16px;
- line-height: normal;
+ padding: 10px 19px;
+ font-size: 17.5px;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
@@ -3173,9 +3178,8 @@ button.close {
}
.btn-small {
- padding: 3px 9px;
- font-size: 12px;
- line-height: 18px;
+ padding: 6px 10px;
+ font-size: 11.9px;
}
.btn-small [class^="icon-"] {
@@ -3183,9 +3187,8 @@ button.close {
}
.btn-mini {
- padding: 2px 6px;
- font-size: 11px;
- line-height: 17px;
+ padding: 5px 6px;
+ font-size: 10.5px;
}
.btn-block {
@@ -4759,14 +4762,18 @@ input[type="submit"].btn.btn-mini {
color: #999999;
}
+.pagination {
+ margin: 20px 0;
+}
+
.pagination ul {
display: inline-block;
*display: inline;
margin-bottom: 0;
margin-left: 0;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
*zoom: 1;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
@@ -4780,6 +4787,8 @@ input[type="submit"].btn.btn-mini {
.pagination ul > li > a,
.pagination ul > li > span {
float: left;
+ padding: 10px 14px;
+ line-height: 1;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
@@ -4829,52 +4838,31 @@ 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;
+ font-size: 17.5px;
}
.pagination-large ul > li > a,
.pagination-large ul > li > span {
- padding: 0 15px;
- line-height: 36px;
+ padding: 10px 19px;
}
.pagination-small {
- height: 26px;
- margin: 15px 0;
- font-size: 12px;
+ font-size: 11.9px;
}
.pagination-small ul > li > a,
.pagination-small ul > li > span {
- padding: 0 10px;
- line-height: 22px;
+ padding: 6px 10px;
}
.pagination-mini {
- height: 23px;
- margin: 10px 0;
- font-size: 11px;
+ font-size: 10.5px;
}
.pagination-mini ul > li > a,
.pagination-mini ul > li > span {
- padding: 0 8px;
- line-height: 21px;
+ padding: 5px 6px;
}
.pager {