twitter-bootstrap-rails 2.1.3 → 2.1.4
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.
Potentially problematic release.
This version of twitter-bootstrap-rails might be problematic. Click here for more details.
- data/README.md +6 -3
- data/app/helpers/bootstrap_flash_helper.rb +3 -1
- data/app/helpers/glyph_helper.rb +12 -0
- data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +3 -3
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +8 -12
- data/lib/generators/bootstrap/layout/templates/layout.html.erb +15 -17
- data/lib/generators/bootstrap/layout/templates/layout.html.haml +13 -14
- data/lib/generators/bootstrap/layout/templates/layout.html.slim +13 -14
- data/lib/generators/bootstrap/themed/themed_generator.rb +16 -5
- data/lib/twitter/bootstrap/rails/version.rb +1 -1
- data/vendor/assets/images/twitter/bootstrap/glyphicons-halflings.png +0 -0
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-affix.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-carousel.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-collapse.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-dropdown.js +3 -3
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-modal.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-popover.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-scrollspy.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-transition.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-typeahead.js +2 -2
- data/vendor/toolkit/font-awesome-ie7.less +245 -0
- data/vendor/toolkit/fontawesome.less +12 -29
- data/vendor/toolkit/twitter/bootstrap/bootstrap.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/button-groups.less +3 -2
- data/vendor/toolkit/twitter/bootstrap/buttons.less +24 -4
- data/vendor/toolkit/twitter/bootstrap/component-animations.less +0 -1
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/forms.less +30 -15
- data/vendor/toolkit/twitter/bootstrap/mixins.less +21 -11
- data/vendor/toolkit/twitter/bootstrap/modals.less +3 -2
- data/vendor/toolkit/twitter/bootstrap/navbar.less +22 -16
- data/vendor/toolkit/twitter/bootstrap/pager.less +6 -3
- data/vendor/toolkit/twitter/bootstrap/pagination.less +17 -17
- data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/reset.less +5 -2
- data/vendor/toolkit/twitter/bootstrap/responsive-767px-max.less +27 -20
- data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +12 -1
- data/vendor/toolkit/twitter/bootstrap/responsive.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/scaffolding.less +5 -4
- data/vendor/toolkit/twitter/bootstrap/sprites.less +11 -5
- data/vendor/toolkit/twitter/bootstrap/tables.less +26 -6
- data/vendor/toolkit/twitter/bootstrap/type.less +18 -3
- data/vendor/toolkit/twitter/bootstrap/variables.less +10 -8
- metadata +15 -13
@@ -12,7 +12,8 @@
|
|
12
12
|
.pager li {
|
13
13
|
display: inline;
|
14
14
|
}
|
15
|
-
.pager a
|
15
|
+
.pager a,
|
16
|
+
.pager span {
|
16
17
|
display: inline-block;
|
17
18
|
padding: 5px 14px;
|
18
19
|
background-color: #fff;
|
@@ -23,14 +24,16 @@
|
|
23
24
|
text-decoration: none;
|
24
25
|
background-color: #f5f5f5;
|
25
26
|
}
|
26
|
-
.pager .next a
|
27
|
+
.pager .next a,
|
28
|
+
.pager .next span {
|
27
29
|
float: right;
|
28
30
|
}
|
29
31
|
.pager .previous a {
|
30
32
|
float: left;
|
31
33
|
}
|
32
34
|
.pager .disabled a,
|
33
|
-
.pager .disabled a:hover
|
35
|
+
.pager .disabled a:hover,
|
36
|
+
.pager .disabled span {
|
34
37
|
color: @grayLight;
|
35
38
|
background-color: #fff;
|
36
39
|
cursor: default;
|
@@ -15,11 +15,11 @@
|
|
15
15
|
.border-radius(3px);
|
16
16
|
.box-shadow(0 1px 2px rgba(0,0,0,.05));
|
17
17
|
}
|
18
|
-
.pagination li {
|
19
|
-
|
20
|
-
|
21
|
-
.pagination a,
|
22
|
-
.pagination span {
|
18
|
+
.pagination ul > li {
|
19
|
+
display: inline;
|
20
|
+
}
|
21
|
+
.pagination ul > li > a,
|
22
|
+
.pagination ul > li > span {
|
23
23
|
float: left;
|
24
24
|
padding: 0 14px;
|
25
25
|
line-height: (@baseLineHeight * 2) - 2;
|
@@ -28,30 +28,30 @@
|
|
28
28
|
border: 1px solid @paginationBorder;
|
29
29
|
border-left-width: 0;
|
30
30
|
}
|
31
|
-
.pagination a:hover,
|
32
|
-
.pagination .active a,
|
33
|
-
.pagination .active span {
|
31
|
+
.pagination ul > li > a:hover,
|
32
|
+
.pagination ul > .active > a,
|
33
|
+
.pagination ul > .active > span {
|
34
34
|
background-color: #f5f5f5;
|
35
35
|
}
|
36
|
-
.pagination .active a,
|
37
|
-
.pagination .active span {
|
36
|
+
.pagination ul > .active > a,
|
37
|
+
.pagination ul > .active > span {
|
38
38
|
color: @grayLight;
|
39
39
|
cursor: default;
|
40
40
|
}
|
41
|
-
.pagination .disabled span,
|
42
|
-
.pagination .disabled a,
|
43
|
-
.pagination .disabled a:hover {
|
41
|
+
.pagination ul > .disabled > span,
|
42
|
+
.pagination ul > .disabled > a,
|
43
|
+
.pagination ul > .disabled > a:hover {
|
44
44
|
color: @grayLight;
|
45
45
|
background-color: transparent;
|
46
46
|
cursor: default;
|
47
47
|
}
|
48
|
-
.pagination li:first-child a,
|
49
|
-
.pagination li:first-child span {
|
48
|
+
.pagination ul > li:first-child > a,
|
49
|
+
.pagination ul > li:first-child > span {
|
50
50
|
border-left-width: 1px;
|
51
51
|
.border-radius(3px 0 0 3px);
|
52
52
|
}
|
53
|
-
.pagination li:last-child a,
|
54
|
-
.pagination li:last-child span {
|
53
|
+
.pagination ul > li:last-child > a,
|
54
|
+
.pagination ul > li:last-child > span {
|
55
55
|
.border-radius(0 3px 3px 0);
|
56
56
|
}
|
57
57
|
|
@@ -77,8 +77,11 @@ sub {
|
|
77
77
|
// -------------------------
|
78
78
|
|
79
79
|
img {
|
80
|
-
|
81
|
-
|
80
|
+
/* Responsive images (ensure images don't scale beyond their parents) */
|
81
|
+
max-width: 100%; /* Part 1: Set a maxium relative to the parent */
|
82
|
+
width: auto\9; /* IE7-8 need help adjusting responsive images */
|
83
|
+
height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
|
84
|
+
|
82
85
|
vertical-align: middle;
|
83
86
|
border: 0;
|
84
87
|
-ms-interpolation-mode: bicubic;
|
@@ -12,7 +12,8 @@
|
|
12
12
|
}
|
13
13
|
// Negative indent the now static "fixed" navbar
|
14
14
|
.navbar-fixed-top,
|
15
|
-
.navbar-fixed-bottom
|
15
|
+
.navbar-fixed-bottom,
|
16
|
+
.navbar-static-top {
|
16
17
|
margin-left: -20px;
|
17
18
|
margin-right: -20px;
|
18
19
|
}
|
@@ -60,8 +61,9 @@
|
|
60
61
|
.row-fluid [class*="span"] {
|
61
62
|
float: none;
|
62
63
|
display: block;
|
63
|
-
width:
|
64
|
+
width: 100%;
|
64
65
|
margin-left: 0;
|
66
|
+
.box-sizing(border-box);
|
65
67
|
}
|
66
68
|
.span12,
|
67
69
|
.row-fluid .span12 {
|
@@ -89,6 +91,9 @@
|
|
89
91
|
display: inline-block; // redeclare so they don't wrap to new lines
|
90
92
|
width: auto;
|
91
93
|
}
|
94
|
+
.controls-row [class*="span"] + [class*="span"] {
|
95
|
+
margin-left: 0;
|
96
|
+
}
|
92
97
|
|
93
98
|
// Modals
|
94
99
|
.modal {
|
@@ -128,24 +133,26 @@
|
|
128
133
|
}
|
129
134
|
|
130
135
|
// Remove the horizontal form styles
|
131
|
-
.form-horizontal
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
136
|
+
.form-horizontal {
|
137
|
+
.control-label {
|
138
|
+
float: none;
|
139
|
+
width: auto;
|
140
|
+
padding-top: 0;
|
141
|
+
text-align: left;
|
142
|
+
}
|
143
|
+
// Move over all input controls and content
|
144
|
+
.controls {
|
145
|
+
margin-left: 0;
|
146
|
+
}
|
147
|
+
// Move the options list down to align with labels
|
148
|
+
.control-list {
|
149
|
+
padding-top: 0; // has to be padding because margin collaspes
|
150
|
+
}
|
151
|
+
// Move over buttons in .form-actions to align with .controls
|
152
|
+
.form-actions {
|
153
|
+
padding-left: 10px;
|
154
|
+
padding-right: 10px;
|
155
|
+
}
|
149
156
|
}
|
150
157
|
|
151
158
|
// Modals
|
@@ -115,6 +115,12 @@
|
|
115
115
|
.nav-collapse .dropdown-menu .divider {
|
116
116
|
display: none;
|
117
117
|
}
|
118
|
+
.nav-collapse .nav > li > .dropdown-menu {
|
119
|
+
&:before,
|
120
|
+
&:after {
|
121
|
+
display: none;
|
122
|
+
}
|
123
|
+
}
|
118
124
|
// Forms in navbar
|
119
125
|
.nav-collapse .navbar-form,
|
120
126
|
.nav-collapse .navbar-search {
|
@@ -123,7 +129,12 @@
|
|
123
129
|
margin: (@baseLineHeight / 2) 0;
|
124
130
|
border-top: 1px solid @navbarBackground;
|
125
131
|
border-bottom: 1px solid @navbarBackground;
|
126
|
-
.box-shadow(
|
132
|
+
.box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
|
133
|
+
}
|
134
|
+
.navbar-inverse .nav-collapse .navbar-form,
|
135
|
+
.navbar-inverse .nav-collapse .navbar-search {
|
136
|
+
border-top-color: @navbarInverseBackground;
|
137
|
+
border-bottom-color: @navbarInverseBackground;
|
127
138
|
}
|
128
139
|
// Pull right (secondary) nav content
|
129
140
|
.navbar .nav-collapse .nav.pull-right {
|
@@ -32,20 +32,21 @@ a:hover {
|
|
32
32
|
// Images
|
33
33
|
// -------------------------
|
34
34
|
|
35
|
+
// Rounded corners
|
35
36
|
.img-rounded {
|
36
37
|
.border-radius(6px);
|
37
38
|
}
|
38
39
|
|
40
|
+
// Add polaroid-esque trim
|
39
41
|
.img-polaroid {
|
40
42
|
padding: 4px;
|
41
43
|
background-color: #fff;
|
42
44
|
border: 1px solid #ccc;
|
43
45
|
border: 1px solid rgba(0,0,0,.2);
|
44
|
-
|
45
|
-
-moz-box-shadow: 0 1px 3px rgba(0,0,0,.1);
|
46
|
-
box-shadow: 0 1px 3px rgba(0,0,0,.1);
|
46
|
+
.box-shadow(0 1px 3px rgba(0,0,0,.1));
|
47
47
|
}
|
48
48
|
|
49
|
+
// Perfect circle
|
49
50
|
.img-circle {
|
50
|
-
.border-radius(500px);
|
51
|
+
.border-radius(500px); // crank the border-radius so it works with most reasonably sized images
|
51
52
|
}
|
@@ -15,7 +15,7 @@
|
|
15
15
|
// <i class="icon-inbox icon-white"></i>
|
16
16
|
|
17
17
|
[class^="icon-"],
|
18
|
-
[class*="
|
18
|
+
[class*="icon-"] {
|
19
19
|
display: inline-block;
|
20
20
|
width: 14px;
|
21
21
|
height: 14px;
|
@@ -30,12 +30,18 @@
|
|
30
30
|
|
31
31
|
/* White icons with optional class, or on hover/active states of certain elements */
|
32
32
|
.icon-white,
|
33
|
-
.nav > .active > a > [class^="icon-"],
|
34
|
-
.nav > .active > a > [class*="
|
33
|
+
.nav-tabs > .active > a > [class^="icon-"],
|
34
|
+
.nav-tabs > .active > a > [class*="icon-"],
|
35
|
+
.nav-pills > .active > a > [class^="icon-"],
|
36
|
+
.nav-pills > .active > a > [class*="icon-"],
|
37
|
+
.nav-list > .active > a > [class^="icon-"],
|
38
|
+
.nav-list > .active > a > [class*="icon-"],
|
39
|
+
.navbar-inverse .nav > .active > a > [class^="icon-"],
|
40
|
+
.navbar-inverse .nav > .active > a > [class*="icon-"],
|
35
41
|
.dropdown-menu > li > a:hover > [class^="icon-"],
|
36
|
-
.dropdown-menu > li > a:hover > [class*="
|
42
|
+
.dropdown-menu > li > a:hover > [class*="icon-"],
|
37
43
|
.dropdown-menu > .active > a > [class^="icon-"],
|
38
|
-
.dropdown-menu > .active > a > [class*="
|
44
|
+
.dropdown-menu > .active > a > [class*="icon-"] {
|
39
45
|
background-image: url(@iconWhiteSpritePath);
|
40
46
|
}
|
41
47
|
|
@@ -133,7 +133,7 @@ table {
|
|
133
133
|
colgroup + tbody tr:first-child td:last-child {
|
134
134
|
-webkit-border-top-right-radius: 4px;
|
135
135
|
border-top-right-radius: 4px;
|
136
|
-
|
136
|
+
-moz-border-radius-topleft: 4px;
|
137
137
|
}
|
138
138
|
|
139
139
|
}
|
@@ -180,7 +180,7 @@ table [class*=span],
|
|
180
180
|
}
|
181
181
|
|
182
182
|
// Change the column widths to account for td/th padding
|
183
|
-
table {
|
183
|
+
.table {
|
184
184
|
.span1 { .tableColumns(1); }
|
185
185
|
.span2 { .tableColumns(2); }
|
186
186
|
.span3 { .tableColumns(3); }
|
@@ -208,18 +208,38 @@ table {
|
|
208
208
|
}
|
209
209
|
|
210
210
|
|
211
|
+
|
211
212
|
// TABLE BACKGROUNDS
|
212
213
|
// -----------------
|
213
214
|
// Exact selectors below required to override .table-striped
|
214
215
|
|
215
|
-
.table {
|
216
|
-
|
216
|
+
.table tbody tr {
|
217
|
+
&.success td {
|
217
218
|
background-color: @successBackground;
|
218
219
|
}
|
219
|
-
|
220
|
+
&.error td {
|
220
221
|
background-color: @errorBackground;
|
221
222
|
}
|
222
|
-
|
223
|
+
&.warning td {
|
224
|
+
background-color: @warningBackground;
|
225
|
+
}
|
226
|
+
&.info td {
|
223
227
|
background-color: @infoBackground;
|
224
228
|
}
|
225
229
|
}
|
230
|
+
|
231
|
+
// Hover states for .table-hover
|
232
|
+
.table-hover tbody tr {
|
233
|
+
&.success:hover td {
|
234
|
+
background-color: darken(@successBackground, 5%);
|
235
|
+
}
|
236
|
+
&.error:hover td {
|
237
|
+
background-color: darken(@errorBackground, 5%);
|
238
|
+
}
|
239
|
+
&.warning:hover td {
|
240
|
+
background-color: darken(@warningBackground, 5%);
|
241
|
+
}
|
242
|
+
&.info:hover td {
|
243
|
+
background-color: darken(@infoBackground, 5%);
|
244
|
+
}
|
245
|
+
}
|
@@ -11,7 +11,7 @@ p {
|
|
11
11
|
}
|
12
12
|
.lead {
|
13
13
|
margin-bottom: @baseLineHeight;
|
14
|
-
font-size:
|
14
|
+
font-size: @baseFontSize * 1.5;
|
15
15
|
font-weight: 200;
|
16
16
|
line-height: @baseLineHeight * 1.5;
|
17
17
|
}
|
@@ -32,9 +32,23 @@ em {
|
|
32
32
|
cite {
|
33
33
|
font-style: normal;
|
34
34
|
}
|
35
|
+
|
36
|
+
// Utility classes
|
35
37
|
.muted {
|
36
38
|
color: @grayLight;
|
37
39
|
}
|
40
|
+
.text-warning {
|
41
|
+
color: @warningText;
|
42
|
+
}
|
43
|
+
.text-error {
|
44
|
+
color: @errorText;
|
45
|
+
}
|
46
|
+
.text-info {
|
47
|
+
color: @infoText;
|
48
|
+
}
|
49
|
+
.text-success {
|
50
|
+
color: @successText;
|
51
|
+
}
|
38
52
|
|
39
53
|
|
40
54
|
// Headings
|
@@ -116,15 +130,16 @@ dd {
|
|
116
130
|
}
|
117
131
|
// Horizontal layout (like forms)
|
118
132
|
.dl-horizontal {
|
133
|
+
.clearfix(); // Ensure dl clears floats if empty dd elements present
|
119
134
|
dt {
|
120
135
|
float: left;
|
121
|
-
width:
|
136
|
+
width: @horizontalComponentOffset - 20;
|
122
137
|
clear: left;
|
123
138
|
text-align: right;
|
124
139
|
.text-overflow();
|
125
140
|
}
|
126
141
|
dd {
|
127
|
-
margin-left:
|
142
|
+
margin-left: @horizontalComponentOffset;
|
128
143
|
}
|
129
144
|
}
|
130
145
|
|
@@ -57,7 +57,6 @@
|
|
57
57
|
@headingsFontWeight: bold; // instead of browser default, bold
|
58
58
|
@headingsColor: inherit; // empty to use BS default, @textColor
|
59
59
|
|
60
|
-
|
61
60
|
// Tables
|
62
61
|
// -------------------------
|
63
62
|
@tableBackground: transparent; // overall background-color
|
@@ -65,7 +64,6 @@
|
|
65
64
|
@tableBackgroundHover: #f5f5f5; // for hover
|
66
65
|
@tableBorder: #ddd; // table and cell border
|
67
66
|
|
68
|
-
|
69
67
|
// Buttons
|
70
68
|
// -------------------------
|
71
69
|
@btnBackground: @white;
|
@@ -107,12 +105,11 @@
|
|
107
105
|
@dropdownDividerBottom: @white;
|
108
106
|
|
109
107
|
@dropdownLinkColor: @grayDark;
|
110
|
-
|
111
108
|
@dropdownLinkColorHover: @white;
|
112
|
-
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
|
113
|
-
|
114
109
|
@dropdownLinkColorActive: @dropdownLinkColor;
|
110
|
+
|
115
111
|
@dropdownLinkBackgroundActive: @linkColor;
|
112
|
+
@dropdownLinkBackgroundHover: @dropdownLinkBackgroundActive;
|
116
113
|
|
117
114
|
|
118
115
|
|
@@ -147,6 +144,11 @@
|
|
147
144
|
@hrBorder: @grayLighter;
|
148
145
|
|
149
146
|
|
147
|
+
// Horizontal forms & lists
|
148
|
+
// -------------------------
|
149
|
+
@horizontalComponentOffset: 180px;
|
150
|
+
|
151
|
+
|
150
152
|
// Wells
|
151
153
|
// -------------------------
|
152
154
|
@wellBackground: #f5f5f5;
|
@@ -157,12 +159,12 @@
|
|
157
159
|
@navbarCollapseWidth: 979px;
|
158
160
|
|
159
161
|
@navbarHeight: 40px;
|
160
|
-
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
|
161
162
|
@navbarBackgroundHighlight: #ffffff;
|
163
|
+
@navbarBackground: darken(@navbarBackgroundHighlight, 5%);
|
162
164
|
@navbarBorder: darken(@navbarBackground, 12%);
|
163
165
|
|
164
|
-
@navbarText:
|
165
|
-
@navbarLinkColor:
|
166
|
+
@navbarText: #777;
|
167
|
+
@navbarLinkColor: #777;
|
166
168
|
@navbarLinkColorHover: @grayDark;
|
167
169
|
@navbarLinkColorActive: @gray;
|
168
170
|
@navbarLinkBackgroundHover: transparent;
|