8000 add new vars for common border-radius, upping border-radius of inputs… · rusongyu/bootstrap@2d90c81 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2d90c81

Browse files
mdomdo
committed
add new vars for common border-radius, upping border-radius of inputs to 4px; add border-radius changes to -large, -small, -mini for buttons and paginations
1 parent 2769241 commit 2d90c81

File tree

6 files changed

+182
-83
lines changed

6 files changed

+182
-83
lines changed

‎docs/assets/css/bootstrap.css

Lines changed: 93 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -992,9 +992,9 @@ input[type="color"],
992992
font-size: 14px;
993993
line-height: 20px;
994994
color: #555555;
995-
-webkit-border-radius: 3px;
996-
-moz-border-radius: 3px;
997-
border-radius: 3px;
995+
-webkit-border-radius: 4px;
996+
-moz-border-radius: 4px;
997+
border-radius: 4px;
998998
}
999999

10001000
input,
@@ -1582,9 +1582,9 @@ select:focus:required:invalid:focus {
15821582
margin-bottom: 0;
15831583
*margin-left: 0;
15841584
vertical-align: top;
1585-
-webkit-border-radius: 0 3px 3px 0;
1586-
-moz-border-radius: 0 3px 3px 0;
1587-
border-radius: 0 3px 3px 0;
1585+
-webkit-border-radius: 0 4px 4px 0;
1586+
-moz-border-radius: 0 4px 4px 0;
1587+
border-radius: 0 4px 4px 0;
15881588
}
15891589

15901590
.input-append input:focus,
@@ -1635,17 +1635,17 @@ select:focus:required:invalid:focus {
16351635

16361636
.input-prepend .add-on:first-child,
16371637
.input-prepend .btn:first-child {
1638-
-webkit-border-radius: 3px 0 0 3px;
1639-
-moz-border-radius: 3px 0 0 3px;
1640-
border-radius: 3px 0 0 3px;
1638+
-webkit-border-radius: 4px 0 0 4px;
1639+
-moz-border-radius: 4px 0 0 4px;
1640+
border-radius: 4px 0 0 4px;
16411641
}
16421642

16431643
.input-append input,
16441644
.input-append select,
16451645
.input-append .uneditable-input {
1646-
-webkit-border-radius: 3px 0 0 3px;
1647-
-moz-border-radius: 3px 0 0 3px;
1648-
border-radius: 3px 0 0 3px;
1646+
-webkit-border-radius: 4px 0 0 4px;
1647+
-moz-border-radius: 4px 0 0 4px;
1648+
border-radius: 4px 0 0 4px;
16491649
}
16501650

16511651
.input-append .add-on,
@@ -1655,9 +1655,9 @@ select:focus:required:invalid:focus {
16551655

16561656
.input-append .add-on:last-child,
16571657
.input-append .btn:last-child {
1658-
-webkit-border-radius: 0 3px 3px 0;
1659-
-moz-border-radius: 0 3px 3px 0;
1660-
border-radius: 0 3px 3px 0;
1658+
-webkit-border-radius: 0 4px 4px 0;
1659+
-moz-border-radius: 0 4px 4px 0;
1660+
border-radius: 0 4px 4px 0;
16611661
}
16621662

16631663
.input-prepend.input-append input,
@@ -1671,17 +1671,17 @@ select:focus:required:invalid:focus {
16711671
.input-prepend.input-append .add-on:first-child,
16721672
.input-prepend.input-append .btn:first-child {
16731673
margin-right: -1px;
1674-
-webkit-border-radius: 3px 0 0 3px;
1675-
-moz-border-radius: 3px 0 0 3px;
1676-
border-radius: 3px 0 0 3px;
1674+
-webkit-border-radius: 4px 0 0 4px;
1675+
-moz-border-radius: 4px 0 0 4px;
1676+
border-radius: 4px 0 0 4px;
16771677
}
16781678

16791679
.input-prepend.input-append .add-on:last-child,
16801680
.input-prepend.input-append .btn:last-child {
16811681
margin-left: -1px;
1682-
-webkit-border-radius: 0 3px 3px 0;
1683-
-moz-border-radius: 0 3px 3px 0;
1684-
border-radius: 0 3px 3px 0;
1682+
-webkit-border-radius: 0 4px 4px 0;
1683+
-moz-border-radius: 0 4px 4px 0;
1684+
border-radius: 0 4px 4px 0;
16851685
}
16861686

16871687
input.search-query {
@@ -3062,7 +3062,7 @@ button.close {
30623062
.btn {
30633063
display: inline-block;
30643064
*display: inline;
3065-
padding: 4px 14px;
3065+
padding: 4px 12px;
30663066
margin-bottom: 0;
30673067
*margin-left: .3em;
30683068
font-size: 14px;
@@ -3159,14 +3159,8 @@ button.close {
31593159
box-shadow: none;
31603160
}
31613161

3162-
.btn-large,
3163-
.btn-small,
3164-
.btn-mini {
3165-
line-height: 1;
3166-
}
3167-
31683162
.btn-large {
3169-
padding: 10px 19px;
3163+
padding: 11px 19px;
31703164
font-size: 17.5px;
31713165
-webkit-border-radius: 5px;
31723166
-moz-border-radius: 5px;
@@ -3178,17 +3172,23 @@ button.close {
31783172
}
31793173

31803174
.btn-small {
3181-
padding: 6px 10px;
3175+
padding: 2px 10px;
31823176
font-size: 11.9px;
3177+
-webkit-border-radius: 3px;
3178+
-moz-border-radius: 3px;
3179+
border-radius: 3px;
31833180
}
31843181

31853182
.btn-small [class^="icon-"] {
31863183
margin-top: 0;
31873184
}
31883185

31893186
.btn-mini {
3190-
padding: 5px 6px;
3187+
padding: 1px 6px;
31913188
font-size: 10.5px;
3189+
-webkit-border-radius: 3px;
3190+
-moz-border-radius: 3px;
3191+
border-radius: 3px;
31923192
}
31933193

31943194
.btn-block {
@@ -4787,8 +4787,8 @@ input[type="submit"].btn.btn-mini {
47874787
.pagination ul > li > a,
47884788
.pagination ul > li > span {
47894789
float: left;
4790-
padding: 10px 14px;
4791-
line-height: 1;
4790+
padding: 4px 12px;
4791+
line-height: 20px;
47924792
text-decoration: none;
47934793
background-color: #ffffff;
47944794
border: 1px solid #dddddd;
@@ -4818,16 +4818,22 @@ input[type="submit"].btn.btn-mini {
48184818
.pagination ul > li:first-child > a,
48194819
.pagination ul > li:first-child > span {
48204820
border-left-width: 1px;
4821-
-webkit-border-radius: 3px 0 0 3px;
4822-
-moz-border-radius: 3px 0 0 3px;
4823-
border-radius: 3px 0 0 3px;
4821+
-webkit-border-bottom-left-radius: 4px;
4822+
border-bottom-left-radius: 4px;
4823+
-webkit-border-top-left-radius: 4px;
4824+
border-top-left-radius: 4px;
4825+
-moz-border-radius-bottomleft: 4px;
4826+
-moz-border-radius-topleft: 4px;
48244827
}
48254828

48264829
.pagination ul > li:last-child > a,
48274830
.pagination ul > li:last-child > span {
4828-
-webkit-border-radius: 0 3px 3px 0;
4829-
-moz-border-radius: 0 3px 3px 0;
4830-
border-radius: 0 3px 3px 0;
4831+
-webkit-border-top-right-radius: 4px;
4832+
border-top-right-radius: 4px;
4833+
-webkit-border-bottom-right-radius: 4px;
4834+
border-bottom-right-radius: 4px;
4835+
-moz-border-radius-topright: 4px;
4836+
-moz-border-radius-bottomright: 4px;
48314837
}
48324838

48334839
.pagination-centered {
@@ -4838,31 +4844,66 @@ input[type="submit"].btn.btn-mini {
48384844
text-align: right;
48394845
}
48404846

4841-
.pagination-large {
4842-
font-size: 17.5px;
4843-
}
4844-
48454847
.pagination-large ul > li > a,
48464848
.pagination-large ul > li > span {
4847-
padding: 10px 19px;
4849+
padding: 11px 19px;
4850+
font-size: 17.5px;
48484851
}
48494852

4850-
.pagination-small {
4851-
font-size: 11.9px;
4853+
.pagination-large ul > li:first-child > a,
4854+
.pagination-large ul > li:first-child > span {
4855+
-webkit-border-bottom-left-radius: 5px;
4856+
border-bottom-left-radius: 5px;
4857+
-webkit-border-top-left-radius: 5px;
4858+
border-top-left-radius: 5px;
4859+
-moz-border-radius-bottomleft: 5px;
4860+
-moz-border-radius-topleft: 5px;
4861+
}
4862+
4863+
.pagination-large ul > li:last-child > a,
4864+
.pagination-large ul > li:last-child > span {
4865+
-webkit-border-top-right-radius: 5px;
4866+
border-top-right-radius: 5px;
4867+
-webkit-border-bottom-right-radius: 5px;
4868+
border-bottom-right-radius: 5px;
4869+
-moz-border-radius-topright: 5px;
4870+
-moz-border-radius-bottomright: 5px;
4871+
}
4872+
4873+
.pagination-mini ul > li:first-child > a,
4874+
.pagination-small ul > li:first-child > a,
4875+
.pagination-mini ul > li:first-child > span,
4876+
.pagination-small ul > li:first-child > span {
4877+
-webkit-border-bottom-left-radius: 3px;
4878+
border-bottom-left-radius: 3px;
4879+
-webkit-border-top-left-radius: 3px;
4880+
border-top-left-radius: 3px;
4881+
-moz-border-radius-bottomleft: 3px;
4882+
-moz-border-radius-topleft: 3px;
4883+
}
4884+
4885+
.pagination-mini ul > li:last-child > a,
4886+
.pagination-small ul > li:last-child > a,
4887+
.pagination-mini ul > li:last-child > span,
4888+
.pagination-small ul > li:last-child > span {
4889+
-webkit-border-top-right-radius: 3px;
4890+
border-top-right-radius: 3px;
4891+
-webkit-border-bottom-right-radius: 3px;
4892+
border-bottom-right-radius: 3px;
4893+
-moz-border-radius-topright: 3px;
4894+
-moz-border-radius-bottomright: 3px;
48524895
}
48534896

48544897
.pagination-small ul > li > a,
48554898
.pagination-small ul > li > span {
4856-
padding: 6px 10px;
4857-
}
4858-
4859-
.pagination-mini {
4860-
font-size: 10.5px;
4899+
padding: 2px 10px;
4900+
font-size: 11.9px;
48614901
}
48624902

48634903
.pagination-mini ul > li > a,
48644904
.pagination-mini ul > li > span {
4865-
padding: 5px 6px;
4905+
padding: 1px 6px;
4906+
font-size: 10.5px;
48664907
}
48674908

48684909
.pager {

‎docs/components.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,17 @@ <h3>Sizes</h3>
15251525
<li><a href="#">&raquo;</a></li>
15261526
</ul>
15271527
</div>
1528+
<div class="pagination">
1529+
<ul>
1530+
<li><a href="#">&laquo;</a></li>
1531+
<li><a href="#">1</a></li>
1532+
<li><a href="#">2</a></li>
1533+
<li><a href="#">3</a></li>
1534+
<li><a href="#">4</a></li>
1535+
<li><a href="#">5</a></li>
1536+
<li><a href="#">&raquo;</a></li>
1537+
</ul>
1538+
</div>
15281539
<div class="pagination pagination-small">
15291540
<ul>
15301541
<li><a href="#">&laquo;</a></li>
@@ -1554,6 +1565,11 @@ <h3>Sizes</h3>
15541565
...
15551566
&lt;/ul&gt;
15561567
&lt;/div&gt;
1568+
&lt;div class="pagination"&gt;
1569+
&lt;ul&gt;
1570+
...
1571+
&lt;/ul&gt;
1572+
&lt;/div&gt;
15571573
&lt;div class="pagination pagination-small"&gt;
15581574
&lt;ul&gt;
15591575
...

‎docs/templates/pages/components.mustache

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,6 +1454,17 @@
14541454
<li><a href="#">&raquo;</a></li>
14551455
</ul>
14561456
</div>
1457+
<div class="pagination">
1458+
<ul>
1459+
<li><a href="#">&laquo;</a></li>
1460+
<li><a href="#">1</a></li>
1461+
<li><a href="#">2</a></li>
1462+
<li><a href="#">3</a></li>
1463+
<li><a href="#">4</a></li>
1464+
<li><a href="#">5</a></li>
1465+
<li><a href="#">&raquo;</a></li>
1466+
</ul>
1467+
</div>
14571468
<div class="pagination pagination-small">
14581469
<ul>
14591470
<li><a href="#">&laquo;</a></li>
@@ -1483,6 +1494,11 @@
14831494
...
14841495
&lt;/ul&gt;
14851496
&lt;/div&gt;
1497+
&lt;div class="pagination"&gt;
1498+
&lt;ul&gt;
1499+
...
1500+
&lt;/ul&gt;
1501+
&lt;/div&gt;
14861502
&lt;div class="pagination pagination-small"&gt;
14871503
&lt;ul&gt;
14881504
...

‎less/buttons.less

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
.btn {
1111
display: inline-block;
1212
.ie7-inline-block();
13-
padding: 4px 14px;
13+
padding: 4px 12px;
1414
margin-bottom: 0; // For input.btn
1515
font-size: @baseFontSize;
1616
line-height: @baseLineHeight;
@@ -71,18 +71,11 @@
7171
// Button Sizes
7272
// --------------------------------------------------
7373

74-
// Reset line-heights
75-
.btn-large,
76-
.btn-small,
77-
.btn-mini {
78-
line-height: 1;
79-
}
80-
8174
// Large
8275
.btn-large {
8376
padding: @paddingLarge;
8477
font-size: @fontSizeLarge;
85-
.border-radius(5px);
78+
.border-radius(@borderRadiusLarge);
8679
}
8780
.btn-large [class^="icon-"] {
8881
margin-top: 2px;
@@ -92,6 +85,7 @@
9285
.btn-small {
9386
padding: @paddingSmall;
9487
font-size: @fontSizeSmall;
88+
.border-radius(@borderRadiusSmall);
9589
}
9690
.btn-small [class^="icon-"] {
9791
margin-top: 0;
@@ -101,6 +95,7 @@
10195
.btn-mini {
10296
padding: @paddingMini;
10397
font-size: @fontSizeMini;
98+
.border-radius(@borderRadiusSmall);
10499
}
105100

106101

0 commit comments

Comments
 (0)
0