sass-twitter-bootstrap 2.2.1 → 2.2.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/lib/sass/twitter/bootstrap/version.rb +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap-affix.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-alert.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-button.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-carousel.js +11 -2
- data/vendor/assets/javascripts/twitter/bootstrap-collapse.js +15 -4
- data/vendor/assets/javascripts/twitter/bootstrap-dropdown.js +16 -3
- data/vendor/assets/javascripts/twitter/bootstrap-modal.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-popover.js +14 -3
- data/vendor/assets/javascripts/twitter/bootstrap-scrollspy.js +13 -2
- data/vendor/assets/javascripts/twitter/bootstrap-tab.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-tooltip.js +12 -1
- data/vendor/assets/javascripts/twitter/bootstrap-transition.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap-typeahead.js +23 -10
- data/{lib → vendor/assets/stylesheets}/tests/buttons.html +3 -3
- data/vendor/assets/stylesheets/tests/css-tests.html +71 -22
- data/{lib → vendor/assets/stylesheets}/tests/forms-responsive.html +3 -3
- data/{lib → vendor/assets/stylesheets}/tests/navbar-fixed-top.html +3 -3
- data/{lib → vendor/assets/stylesheets}/tests/navbar-static-top.html +3 -3
- data/vendor/assets/stylesheets/tests/navbar.html +3 -3
- data/vendor/assets/stylesheets/twitter/_alerts.scss +14 -0
- data/vendor/assets/stylesheets/twitter/_breadcrumbs.scss +5 -5
- data/vendor/assets/stylesheets/twitter/_button-groups.scss +27 -42
- data/vendor/assets/stylesheets/twitter/_buttons.scss +5 -7
- data/vendor/assets/stylesheets/twitter/_carousel.scss +15 -15
- data/vendor/assets/stylesheets/twitter/_code.scss +3 -0
- data/vendor/assets/stylesheets/twitter/_dropdowns.scss +5 -9
- data/vendor/assets/stylesheets/twitter/_forms.scss +12 -8
- data/vendor/assets/stylesheets/twitter/_labels-badges.scss +25 -15
- data/{lib → vendor/assets/stylesheets/twitter}/_media.scss +0 -0
- data/vendor/assets/stylesheets/twitter/_mixins.scss +3 -3
- data/vendor/assets/stylesheets/twitter/_modals.scss +1 -1
- data/vendor/assets/stylesheets/twitter/_navbar.scss +22 -4
- data/vendor/assets/stylesheets/twitter/_navs.scss +6 -0
- data/vendor/assets/stylesheets/twitter/_popovers.scss +50 -38
- data/vendor/assets/stylesheets/twitter/_reset.scss +82 -4
- data/vendor/assets/stylesheets/twitter/_tables.scss +36 -35
- data/vendor/assets/stylesheets/twitter/_type.scss +29 -21
- data/vendor/assets/stylesheets/twitter/_variables.scss +7 -7
- data/vendor/assets/stylesheets/twitter/bootstrap.scss +1 -1
- data/vendor/assets/stylesheets/twitter/responsive.scss +10 -1
- metadata +66 -52
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
<![endif]-->
|
|
24
24
|
|
|
25
25
|
<!-- Le fav and touch icons -->
|
|
26
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
27
26
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
28
27
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
29
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
30
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
31
31
|
</head>
|
|
32
32
|
|
|
33
33
|
<body>
|
|
@@ -22,11 +22,11 @@
|
|
|
22
22
|
<![endif]-->
|
|
23
23
|
|
|
24
24
|
<!-- Le fav and touch icons -->
|
|
25
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
26
25
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
27
26
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
28
|
-
|
|
29
|
-
|
|
27
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
28
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
29
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
30
30
|
</head>
|
|
31
31
|
|
|
32
32
|
<body>
|
|
@@ -107,13 +107,13 @@
|
|
|
107
107
|
|
|
108
108
|
<div class="row">
|
|
109
109
|
<div class="span4">
|
|
110
|
-
<img src="
|
|
110
|
+
<img data-src="holder.js/600x600" height="200">
|
|
111
111
|
</div>
|
|
112
112
|
<div class="span4">
|
|
113
|
-
<img src="
|
|
113
|
+
<img data-src="holder.js/600x600">
|
|
114
114
|
</div>
|
|
115
115
|
<div class="span4">
|
|
116
|
-
<img src="
|
|
116
|
+
<img data-src="holder.js/600x600">
|
|
117
117
|
</div>
|
|
118
118
|
</div>
|
|
119
119
|
|
|
@@ -121,13 +121,13 @@
|
|
|
121
121
|
|
|
122
122
|
<div class="row">
|
|
123
123
|
<div class="span4">
|
|
124
|
-
<img src="
|
|
124
|
+
<img data-src="holder.js/600x900" style="width: 200px;">
|
|
125
125
|
</div>
|
|
126
126
|
<div class="span4">
|
|
127
|
-
<img src="
|
|
127
|
+
<img data-src="holder.js/200x300">
|
|
128
128
|
</div>
|
|
129
129
|
<div class="span4">
|
|
130
|
-
<img src="
|
|
130
|
+
<img data-src="holder.js/600x600">
|
|
131
131
|
</div>
|
|
132
132
|
</div>
|
|
133
133
|
|
|
@@ -593,6 +593,55 @@
|
|
|
593
593
|
</div>
|
|
594
594
|
</div><!--/row-->
|
|
595
595
|
|
|
596
|
+
<h4>Nesting and striping</h4>
|
|
597
|
+
<table class="table table-bordered table-striped">
|
|
598
|
+
<thead>
|
|
599
|
+
<tr>
|
|
600
|
+
<th>Test</th>
|
|
601
|
+
</tr>
|
|
602
|
+
</thead>
|
|
603
|
+
<tbody>
|
|
604
|
+
<tr>
|
|
605
|
+
<td>
|
|
606
|
+
<table class="table table-bordered table-striped">
|
|
607
|
+
<thead>
|
|
608
|
+
<tr>
|
|
609
|
+
<th>Test</th>
|
|
610
|
+
<th>Test</th>
|
|
611
|
+
</tr>
|
|
612
|
+
</thead>
|
|
613
|
+
<tbody>
|
|
614
|
+
<tr>
|
|
615
|
+
<td>
|
|
616
|
+
test
|
|
617
|
+
</td>
|
|
618
|
+
<td>
|
|
619
|
+
test
|
|
620
|
+
</td>
|
|
621
|
+
</tr>
|
|
622
|
+
<tr>
|
|
623
|
+
<td>
|
|
624
|
+
test
|
|
625
|
+
</td>
|
|
626
|
+
<td>
|
|
627
|
+
test
|
|
628
|
+
</td>
|
|
629
|
+
</tr>
|
|
630
|
+
<tr>
|
|
631
|
+
<td>
|
|
632
|
+
test
|
|
633
|
+
</td>
|
|
634
|
+
<td>
|
|
635
|
+
test
|
|
636
|
+
</td>
|
|
637
|
+
</tr>
|
|
638
|
+
</tbody>
|
|
639
|
+
</table>
|
|
640
|
+
</td>
|
|
641
|
+
</tr>
|
|
642
|
+
</tbody>
|
|
643
|
+
</table>
|
|
644
|
+
|
|
596
645
|
<h4>Fluid grid sizing</h4>
|
|
597
646
|
<div class="row-fluid">
|
|
598
647
|
<div class="span12">
|
|
@@ -996,16 +1045,16 @@
|
|
|
996
1045
|
<h4>Default thumbnails (no grid sizing)</h4>
|
|
997
1046
|
<ul class="thumbnails">
|
|
998
1047
|
<li class="thumbnail">
|
|
999
|
-
<img src="
|
|
1048
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1000
1049
|
</li>
|
|
1001
1050
|
<li class="thumbnail">
|
|
1002
|
-
<img src="
|
|
1051
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1003
1052
|
</li>
|
|
1004
1053
|
<li class="thumbnail">
|
|
1005
|
-
<img src="
|
|
1054
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1006
1055
|
</li>
|
|
1007
1056
|
<li class="thumbnail">
|
|
1008
|
-
<img src="
|
|
1057
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1009
1058
|
</li>
|
|
1010
1059
|
</ul>
|
|
1011
1060
|
|
|
@@ -1014,17 +1063,17 @@
|
|
|
1014
1063
|
<ul class="thumbnails">
|
|
1015
1064
|
<li class="span3 offset3">
|
|
1016
1065
|
<a href="#" class="thumbnail">
|
|
1017
|
-
<img src="
|
|
1066
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1018
1067
|
</a>
|
|
1019
1068
|
</li>
|
|
1020
1069
|
<li class="span3">
|
|
1021
1070
|
<a href="#" class="thumbnail">
|
|
1022
|
-
<img src="
|
|
1071
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1023
1072
|
</a>
|
|
1024
1073
|
</li>
|
|
1025
1074
|
<li class="span3">
|
|
1026
1075
|
<a href="#" class="thumbnail">
|
|
1027
|
-
<img src="
|
|
1076
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1028
1077
|
</a>
|
|
1029
1078
|
</li>
|
|
1030
1079
|
</ul>
|
|
@@ -1034,17 +1083,17 @@
|
|
|
1034
1083
|
<ul class="thumbnails">
|
|
1035
1084
|
<li class="span3">
|
|
1036
1085
|
<a href="#" class="thumbnail">
|
|
1037
|
-
<img src="
|
|
1086
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1038
1087
|
</a>
|
|
1039
1088
|
</li>
|
|
1040
1089
|
<li class="span3 offset3">
|
|
1041
1090
|
<a href="#" class="thumbnail">
|
|
1042
|
-
<img src="
|
|
1091
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1043
1092
|
</a>
|
|
1044
1093
|
</li>
|
|
1045
1094
|
<li class="span3">
|
|
1046
1095
|
<a href="#" class="thumbnail">
|
|
1047
|
-
<img src="
|
|
1096
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1048
1097
|
</a>
|
|
1049
1098
|
</li>
|
|
1050
1099
|
</ul>
|
|
@@ -1055,17 +1104,17 @@
|
|
|
1055
1104
|
<ul class="thumbnails">
|
|
1056
1105
|
<li class="span4">
|
|
1057
1106
|
<a href="#" class="thumbnail">
|
|
1058
|
-
<img src="
|
|
1107
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1059
1108
|
</a>
|
|
1060
1109
|
</li>
|
|
1061
1110
|
<li class="span4">
|
|
1062
1111
|
<a href="#" class="thumbnail">
|
|
1063
|
-
<img src="
|
|
1112
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1064
1113
|
</a>
|
|
1065
1114
|
</li>
|
|
1066
1115
|
<li class="span4">
|
|
1067
1116
|
<a href="#" class="thumbnail">
|
|
1068
|
-
<img src="
|
|
1117
|
+
<img data-src="holder.js/260x180" alt="">
|
|
1069
1118
|
</a>
|
|
1070
1119
|
</li>
|
|
1071
1120
|
</ul>
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
<![endif]-->
|
|
24
24
|
|
|
25
25
|
<!-- Le fav and touch icons -->
|
|
26
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
27
26
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
28
27
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
29
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
30
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
31
31
|
</head>
|
|
32
32
|
|
|
33
33
|
<body>
|
|
@@ -23,11 +23,11 @@
|
|
|
23
23
|
<![endif]-->
|
|
24
24
|
|
|
25
25
|
<!-- Le fav and touch icons -->
|
|
26
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
27
26
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
28
27
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
29
|
-
|
|
30
|
-
|
|
28
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
29
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
30
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
31
31
|
</head>
|
|
32
32
|
|
|
33
33
|
<body>
|
|
@@ -25,11 +25,11 @@
|
|
|
25
25
|
<![endif]-->
|
|
26
26
|
|
|
27
27
|
<!-- Le fav and touch icons -->
|
|
28
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
29
28
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
30
29
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
31
|
-
|
|
32
|
-
|
|
30
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
31
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
32
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
33
33
|
</head>
|
|
34
34
|
|
|
35
35
|
<body>
|
|
@@ -26,11 +26,11 @@
|
|
|
26
26
|
<![endif]-->
|
|
27
27
|
|
|
28
28
|
<!-- Le fav and touch icons -->
|
|
29
|
-
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.ico">
|
|
30
29
|
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../../docs/assets/ico/apple-touch-icon-144-precomposed.png">
|
|
31
30
|
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../../docs/assets/ico/apple-touch-icon-114-precomposed.png">
|
|
32
|
-
|
|
33
|
-
|
|
31
|
+
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../../docs/assets/ico/apple-touch-icon-72-precomposed.png">
|
|
32
|
+
<link rel="apple-touch-icon-precomposed" href="../../docs/assets/ico/apple-touch-icon-57-precomposed.png">
|
|
33
|
+
<link rel="shortcut icon" href="../../docs/assets/ico/favicon.png">
|
|
34
34
|
</head>
|
|
35
35
|
|
|
36
36
|
<body>
|
|
@@ -13,6 +13,10 @@
|
|
|
13
13
|
background-color: $warningBackground;
|
|
14
14
|
border: 1px solid $warningBorder;
|
|
15
15
|
@include border-radius($baseBorderRadius);
|
|
16
|
+
}
|
|
17
|
+
.alert,
|
|
18
|
+
.alert h4 {
|
|
19
|
+
// Specified for the h4 to prevent conflicts of changing $headingsColor
|
|
16
20
|
color: $warningText;
|
|
17
21
|
}
|
|
18
22
|
.alert h4 {
|
|
@@ -36,17 +40,27 @@
|
|
|
36
40
|
border-color: $successBorder;
|
|
37
41
|
color: $successText;
|
|
38
42
|
}
|
|
43
|
+
.alert-success h4 {
|
|
44
|
+
color: $successText;
|
|
45
|
+
}
|
|
39
46
|
.alert-danger,
|
|
40
47
|
.alert-error {
|
|
41
48
|
background-color: $errorBackground;
|
|
42
49
|
border-color: $errorBorder;
|
|
43
50
|
color: $errorText;
|
|
44
51
|
}
|
|
52
|
+
.alert-danger h4,
|
|
53
|
+
.alert-error h4 {
|
|
54
|
+
color: $errorText;
|
|
55
|
+
}
|
|
45
56
|
.alert-info {
|
|
46
57
|
background-color: $infoBackground;
|
|
47
58
|
border-color: $infoBorder;
|
|
48
59
|
color: $infoText;
|
|
49
60
|
}
|
|
61
|
+
.alert-info h4 {
|
|
62
|
+
color: $infoText;
|
|
63
|
+
}
|
|
50
64
|
|
|
51
65
|
|
|
52
66
|
// Block alerts
|
|
@@ -9,14 +9,14 @@
|
|
|
9
9
|
list-style: none;
|
|
10
10
|
background-color: #f5f5f5;
|
|
11
11
|
@include border-radius($baseBorderRadius);
|
|
12
|
-
li {
|
|
12
|
+
> li {
|
|
13
13
|
display: inline-block;
|
|
14
14
|
@include ie7-inline-block();
|
|
15
15
|
text-shadow: 0 1px 0 $white;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
> .divider {
|
|
17
|
+
padding: 0 5px;
|
|
18
|
+
color: #ccc;
|
|
19
|
+
}
|
|
20
20
|
}
|
|
21
21
|
.active {
|
|
22
22
|
color: $grayLight;
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
font-size: 0; // Hack to remove whitespace that results from using inline-block
|
|
25
25
|
margin-top: $baseLineHeight / 2;
|
|
26
26
|
margin-bottom: $baseLineHeight / 2;
|
|
27
|
-
.btn + .btn,
|
|
28
|
-
.btn-group + .btn,
|
|
29
|
-
.btn + .btn-group {
|
|
27
|
+
> .btn + .btn,
|
|
28
|
+
> .btn-group + .btn,
|
|
29
|
+
> .btn + .btn-group {
|
|
30
30
|
margin-left: 5px;
|
|
31
31
|
}
|
|
32
32
|
}
|
|
@@ -40,59 +40,44 @@
|
|
|
40
40
|
margin-left: -1px;
|
|
41
41
|
}
|
|
42
42
|
.btn-group > .btn,
|
|
43
|
-
.btn-group > .dropdown-menu
|
|
43
|
+
.btn-group > .dropdown-menu,
|
|
44
|
+
.btn-group > .popover {
|
|
44
45
|
font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
|
|
45
46
|
}
|
|
46
47
|
|
|
47
48
|
// Reset fonts for other sizes
|
|
48
49
|
.btn-group > .btn-mini {
|
|
49
|
-
font-size:
|
|
50
|
+
font-size: $fontSizeMini;
|
|
50
51
|
}
|
|
51
52
|
.btn-group > .btn-small {
|
|
52
|
-
font-size:
|
|
53
|
+
font-size: $fontSizeSmall;
|
|
53
54
|
}
|
|
54
55
|
.btn-group > .btn-large {
|
|
55
|
-
font-size:
|
|
56
|
+
font-size: $fontSizeLarge;
|
|
56
57
|
}
|
|
57
58
|
|
|
58
59
|
// Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
|
|
59
60
|
.btn-group > .btn:first-child {
|
|
60
61
|
margin-left: 0;
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
border-top-left-radius: 4px;
|
|
64
|
-
-webkit-border-bottom-left-radius: 4px;
|
|
65
|
-
-moz-border-radius-bottomleft: 4px;
|
|
66
|
-
border-bottom-left-radius: 4px;
|
|
62
|
+
@include border-top-left-radius($baseBorderRadius);
|
|
63
|
+
@include border-bottom-left-radius($baseBorderRadius);
|
|
67
64
|
}
|
|
68
65
|
// Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
|
|
69
66
|
.btn-group > .btn:last-child,
|
|
70
67
|
.btn-group > .dropdown-toggle {
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
border-top-right-radius: 4px;
|
|
74
|
-
-webkit-border-bottom-right-radius: 4px;
|
|
75
|
-
-moz-border-radius-bottomright: 4px;
|
|
76
|
-
border-bottom-right-radius: 4px;
|
|
68
|
+
@include border-top-right-radius($baseBorderRadius);
|
|
69
|
+
@include border-bottom-right-radius($baseBorderRadius);
|
|
77
70
|
}
|
|
78
71
|
// Reset corners for large buttons
|
|
79
72
|
.btn-group > .btn.large:first-child {
|
|
80
73
|
margin-left: 0;
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
border-top-left-radius: 6px;
|
|
84
|
-
-webkit-border-bottom-left-radius: 6px;
|
|
85
|
-
-moz-border-radius-bottomleft: 6px;
|
|
86
|
-
border-bottom-left-radius: 6px;
|
|
74
|
+
@include border-top-left-radius($borderRadiusLarge);
|
|
75
|
+
@include border-bottom-left-radius($borderRadiusLarge);
|
|
87
76
|
}
|
|
88
77
|
.btn-group > .btn.large:last-child,
|
|
89
78
|
.btn-group > .large.dropdown-toggle {
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
border-top-right-radius: 6px;
|
|
93
|
-
-webkit-border-bottom-right-radius: 6px;
|
|
94
|
-
-moz-border-radius-bottomright: 6px;
|
|
95
|
-
border-bottom-right-radius: 6px;
|
|
79
|
+
@include border-top-right-radius($borderRadiusLarge);
|
|
80
|
+
@include border-bottom-right-radius($borderRadiusLarge);
|
|
96
81
|
}
|
|
97
82
|
|
|
98
83
|
// On hover/focus/active, bring the proper btn to front
|
|
@@ -218,25 +203,25 @@
|
|
|
218
203
|
display: inline-block; // makes buttons only take up the width they need
|
|
219
204
|
@include ie7-inline-block();
|
|
220
205
|
}
|
|
221
|
-
.btn-group-vertical .btn {
|
|
206
|
+
.btn-group-vertical > .btn {
|
|
222
207
|
display: block;
|
|
223
208
|
float: none;
|
|
224
|
-
width: 100%;
|
|
209
|
+
max-width: 100%;
|
|
225
210
|
@include border-radius(0);
|
|
226
211
|
}
|
|
227
|
-
.btn-group-vertical .btn + .btn {
|
|
212
|
+
.btn-group-vertical > .btn + .btn {
|
|
228
213
|
margin-left: 0;
|
|
229
214
|
margin-top: -1px;
|
|
230
215
|
}
|
|
231
|
-
.btn-group-vertical .btn:first-child {
|
|
232
|
-
@include border-radius(
|
|
216
|
+
.btn-group-vertical > .btn:first-child {
|
|
217
|
+
@include border-radius($baseBorderRadius $baseBorderRadius 0 0);
|
|
233
218
|
}
|
|
234
|
-
.btn-group-vertical .btn:last-child {
|
|
235
|
-
@include border-radius(0 0
|
|
219
|
+
.btn-group-vertical > .btn:last-child {
|
|
220
|
+
@include border-radius(0 0 $baseBorderRadius $baseBorderRadius);
|
|
236
221
|
}
|
|
237
|
-
.btn-group-vertical .btn-large:first-child {
|
|
238
|
-
@include border-radius(
|
|
222
|
+
.btn-group-vertical > .btn-large:first-child {
|
|
223
|
+
@include border-radius($borderRadiusLarge $borderRadiusLarge 0 0);
|
|
239
224
|
}
|
|
240
|
-
.btn-group-vertical .btn-large:last-child {
|
|
241
|
-
@include border-radius(0 0
|
|
225
|
+
.btn-group-vertical > .btn-large:last-child {
|
|
226
|
+
@include border-radius(0 0 $borderRadiusLarge $borderRadiusLarge);
|
|
242
227
|
}
|