twitter-bootstrap-rails 2.0.8 → 2.0.9
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of twitter-bootstrap-rails might be problematic. Click here for more details.
- data/README.md +1 -0
- data/app/views/twitter-bootstrap/_breadcrumbs.html.erb +10 -10
- data/lib/generators/bootstrap/install/install_generator.rb +1 -1
- data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less +10 -6
- data/lib/generators/bootstrap/layout/templates/layout.html.haml +0 -1
- data/lib/twitter/bootstrap/rails/twitter-bootstrap-breadcrumbs.rb +2 -2
- data/lib/twitter/bootstrap/rails/version.rb +7 -7
- data/vendor/assets/fonts/fontawesome-webfont.eot +0 -0
- data/vendor/assets/fonts/fontawesome-webfont.svg +247 -167
- data/vendor/assets/fonts/fontawesome-webfont.ttf +0 -0
- data/vendor/assets/fonts/fontawesome-webfont.woff +0 -0
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-alert.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-button.js +1 -1
- 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 +1 -1
- 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 +2 -2
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tab.js +1 -1
- data/vendor/assets/javascripts/twitter/bootstrap/bootstrap-tooltip.js +3 -3
- 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/fontawesome.less +265 -188
- data/vendor/toolkit/twitter/bootstrap/bootstrap.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/component-animations.less +3 -3
- data/vendor/toolkit/twitter/bootstrap/dropdowns.less +3 -3
- data/vendor/toolkit/twitter/bootstrap/forms.less +91 -92
- data/vendor/toolkit/twitter/bootstrap/mixins.less +20 -5
- data/vendor/toolkit/twitter/bootstrap/navbar.less +2 -8
- data/vendor/toolkit/twitter/bootstrap/reset.less +5 -0
- data/vendor/toolkit/twitter/bootstrap/responsive-navbar.less +9 -2
- data/vendor/toolkit/twitter/bootstrap/responsive.less +1 -1
- data/vendor/toolkit/twitter/bootstrap/sprites.less +2 -2
- data/vendor/toolkit/twitter/bootstrap/type.less +1 -4
- data/vendor/toolkit/twitter/bootstrap/variables.less +2 -1
- metadata +12 -15
- data/vendor/assets/fonts/fontawesome-webfont.svgz +0 -0
- data/vendor/toolkit/twitter/bootstrap/badges.less +0 -40
- data/vendor/toolkit/twitter/bootstrap/labels.less +0 -38
@@ -71,7 +71,7 @@
|
|
71
71
|
|
72
72
|
// Dividers (basically an hr) within the dropdown
|
73
73
|
.divider {
|
74
|
-
.nav-divider();
|
74
|
+
.nav-divider(@dropdownDividerTop, @dropdownDividerBottom);
|
75
75
|
}
|
76
76
|
|
77
77
|
// Links within the dropdown menu
|
@@ -103,14 +103,14 @@
|
|
103
103
|
// make the menu appear below buttons that appeared later on the page
|
104
104
|
*z-index: @zindexDropdown;
|
105
105
|
|
106
|
-
.dropdown-menu {
|
106
|
+
& > .dropdown-menu {
|
107
107
|
display: block;
|
108
108
|
}
|
109
109
|
}
|
110
110
|
|
111
111
|
// Right aligned dropdowns
|
112
112
|
// ---------------------------
|
113
|
-
.pull-right .dropdown-menu {
|
113
|
+
.pull-right > .dropdown-menu {
|
114
114
|
right: 0;
|
115
115
|
left: auto;
|
116
116
|
}
|
@@ -27,7 +27,7 @@ legend {
|
|
27
27
|
line-height: @baseLineHeight * 2;
|
28
28
|
color: @grayDark;
|
29
29
|
border: 0;
|
30
|
-
border-bottom: 1px solid #
|
30
|
+
border-bottom: 1px solid #e5e5e5;
|
31
31
|
|
32
32
|
// Small
|
33
33
|
small {
|
@@ -55,72 +55,101 @@ textarea {
|
|
55
55
|
label {
|
56
56
|
display: block;
|
57
57
|
margin-bottom: 5px;
|
58
|
-
color: @grayDark;
|
59
58
|
}
|
60
59
|
|
61
|
-
//
|
62
|
-
|
63
|
-
|
60
|
+
// Form controls
|
61
|
+
// -------------------------
|
62
|
+
|
63
|
+
// Shared size and type resets
|
64
64
|
select,
|
65
|
+
textarea,
|
66
|
+
input[type="text"],
|
67
|
+
input[type="password"],
|
68
|
+
input[type="datetime"],
|
69
|
+
input[type="datetime-local"],
|
70
|
+
input[type="date"],
|
71
|
+
input[type="month"],
|
72
|
+
input[type="time"],
|
73
|
+
input[type="week"],
|
74
|
+
input[type="number"],
|
75
|
+
input[type="email"],
|
76
|
+
input[type="url"],
|
77
|
+
input[type="search"],
|
78
|
+
input[type="tel"],
|
79
|
+
input[type="color"],
|
65
80
|
.uneditable-input {
|
66
81
|
display: inline-block;
|
67
|
-
width: 210px;
|
68
82
|
height: @baseLineHeight;
|
69
83
|
padding: 4px;
|
70
84
|
margin-bottom: 9px;
|
71
85
|
font-size: @baseFontSize;
|
72
86
|
line-height: @baseLineHeight;
|
73
87
|
color: @gray;
|
74
|
-
background-color: @inputBackground;
|
75
|
-
border: 1px solid @inputBorder;
|
76
|
-
.border-radius(@inputBorderRadius);
|
77
88
|
}
|
78
|
-
|
79
|
-
|
89
|
+
|
90
|
+
// Reset appearance properties for textual inputs and textarea
|
91
|
+
// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
|
92
|
+
input,
|
93
|
+
textarea {
|
94
|
+
width: 210px;
|
95
|
+
}
|
96
|
+
// Reset height since textareas have rows
|
97
|
+
textarea {
|
80
98
|
height: auto;
|
81
99
|
}
|
100
|
+
// Everything else
|
101
|
+
textarea,
|
102
|
+
input[type="text"],
|
103
|
+
input[type="password"],
|
104
|
+
input[type="datetime"],
|
105
|
+
input[type="datetime-local"],
|
106
|
+
input[type="date"],
|
107
|
+
input[type="month"],
|
108
|
+
input[type="time"],
|
109
|
+
input[type="week"],
|
110
|
+
input[type="number"],
|
111
|
+
input[type="email"],
|
112
|
+
input[type="url"],
|
113
|
+
input[type="search"],
|
114
|
+
input[type="tel"],
|
115
|
+
input[type="color"],
|
116
|
+
.uneditable-input {
|
117
|
+
background-color: @inputBackground;
|
118
|
+
border: 1px solid @inputBorder;
|
119
|
+
.border-radius(@inputBorderRadius);
|
120
|
+
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
121
|
+
@transition: border linear .2s, box-shadow linear .2s;
|
122
|
+
.transition(@transition);
|
82
123
|
|
83
|
-
//
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
124
|
+
// Focus state
|
125
|
+
&:focus {
|
126
|
+
border-color: rgba(82,168,236,.8);
|
127
|
+
outline: 0;
|
128
|
+
outline: thin dotted \9; /* IE6-9 */
|
129
|
+
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
|
130
|
+
}
|
88
131
|
}
|
89
132
|
|
90
|
-
//
|
91
|
-
input[type="
|
92
|
-
input[type="checkbox"]
|
93
|
-
input[type="radio"] {
|
94
|
-
width: auto;
|
95
|
-
height: auto;
|
96
|
-
padding: 0;
|
133
|
+
// Position radios and checkboxes better
|
134
|
+
input[type="radio"],
|
135
|
+
input[type="checkbox"] {
|
97
136
|
margin: 3px 0;
|
98
137
|
*margin-top: 0; /* IE7 */
|
99
138
|
line-height: normal;
|
100
139
|
cursor: pointer;
|
101
|
-
background-color: transparent;
|
102
|
-
border: 0 \9; /* IE9 and down */
|
103
|
-
.border-radius(0);
|
104
|
-
}
|
105
|
-
input[type="image"] {
|
106
|
-
border: 0;
|
107
140
|
}
|
108
141
|
|
109
|
-
// Reset
|
110
|
-
input[type="
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
border: initial;
|
117
|
-
.box-shadow(none);
|
142
|
+
// Reset width of input buttons, radios, checkboxes
|
143
|
+
input[type="submit"],
|
144
|
+
input[type="reset"],
|
145
|
+
input[type="button"],
|
146
|
+
input[type="radio"],
|
147
|
+
input[type="checkbox"] {
|
148
|
+
width: auto; // Override of generic input selector
|
118
149
|
}
|
119
150
|
|
120
|
-
//
|
121
|
-
|
122
|
-
input[type="reset"],
|
123
|
-
input[type="submit"] {
|
151
|
+
// Make uneditable textareas behave like a textarea
|
152
|
+
.uneditable-textarea {
|
124
153
|
width: auto;
|
125
154
|
height: auto;
|
126
155
|
}
|
@@ -133,15 +162,10 @@ input[type="file"] {
|
|
133
162
|
line-height: 28px;
|
134
163
|
}
|
135
164
|
|
136
|
-
//
|
137
|
-
input[type="file"] {
|
138
|
-
line-height: 18px \9;
|
139
|
-
}
|
140
|
-
|
141
|
-
// Chrome on Linux and Mobile Safari need background-color
|
165
|
+
// Make select elements obey height by applying a border
|
142
166
|
select {
|
143
167
|
width: 220px; // default input width + 10px of padding that doesn't get applied
|
144
|
-
|
168
|
+
border: 1px solid #bbb;
|
145
169
|
}
|
146
170
|
|
147
171
|
// Make multiple select elements height not fixed
|
@@ -150,19 +174,12 @@ select[size] {
|
|
150
174
|
height: auto;
|
151
175
|
}
|
152
176
|
|
153
|
-
//
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
textarea {
|
160
|
-
height: auto;
|
161
|
-
}
|
162
|
-
|
163
|
-
// Hidden inputs
|
164
|
-
input[type="hidden"] {
|
165
|
-
display: none;
|
177
|
+
// Focus for select, file, radio, and checkbox
|
178
|
+
select:focus,
|
179
|
+
input[type="file"]:focus,
|
180
|
+
input[type="radio"]:focus,
|
181
|
+
input[type="checkbox"]:focus {
|
182
|
+
.tab-focus();
|
166
183
|
}
|
167
184
|
|
168
185
|
|
@@ -204,32 +221,6 @@ input[type="hidden"] {
|
|
204
221
|
|
205
222
|
|
206
223
|
|
207
|
-
// FOCUS STATE
|
208
|
-
// -----------
|
209
|
-
|
210
|
-
input,
|
211
|
-
textarea {
|
212
|
-
.box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
|
213
|
-
@transition: border linear .2s, box-shadow linear .2s;
|
214
|
-
.transition(@transition);
|
215
|
-
}
|
216
|
-
input:focus,
|
217
|
-
textarea:focus {
|
218
|
-
border-color: rgba(82,168,236,.8);
|
219
|
-
outline: 0;
|
220
|
-
outline: thin dotted \9; /* IE6-9 */
|
221
|
-
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
|
222
|
-
}
|
223
|
-
input[type="file"]:focus,
|
224
|
-
input[type="radio"]:focus,
|
225
|
-
input[type="checkbox"]:focus,
|
226
|
-
select:focus {
|
227
|
-
.tab-focus();
|
228
|
-
.box-shadow(none); // override for file inputs
|
229
|
-
}
|
230
|
-
|
231
|
-
|
232
|
-
|
233
224
|
// INPUT SIZES
|
234
225
|
// -----------
|
235
226
|
|
@@ -254,14 +245,22 @@ textarea[class*="span"],
|
|
254
245
|
float: none;
|
255
246
|
margin-left: 0;
|
256
247
|
}
|
248
|
+
// Ensure input-prepend/append never wraps
|
249
|
+
.input-append input[class*="span"],
|
250
|
+
.input-append .uneditable-input[class*="span"],
|
251
|
+
.input-prepend input[class*="span"],
|
252
|
+
.input-prepend .uneditable-input[class*="span"],
|
253
|
+
.row-fluid .input-prepend [class*="span"],
|
254
|
+
.row-fluid .input-append [class*="span"] {
|
255
|
+
display: inline-block;
|
256
|
+
}
|
257
257
|
|
258
258
|
|
259
259
|
|
260
260
|
// GRID SIZING FOR INPUTS
|
261
261
|
// ----------------------
|
262
262
|
|
263
|
-
#grid > .input
|
264
|
-
|
263
|
+
#grid > .input(@gridColumnWidth, @gridGutterWidth);
|
265
264
|
|
266
265
|
|
267
266
|
|
@@ -329,7 +328,7 @@ select:focus:required:invalid {
|
|
329
328
|
margin-top: @baseLineHeight;
|
330
329
|
margin-bottom: @baseLineHeight;
|
331
330
|
background-color: @formActionsBackground;
|
332
|
-
border-top: 1px solid #
|
331
|
+
border-top: 1px solid #e5e5e5;
|
333
332
|
.clearfix(); // Adding clearfix to allow for .pull-right button containers
|
334
333
|
}
|
335
334
|
|
@@ -344,7 +343,7 @@ select:focus:required:invalid {
|
|
344
343
|
}
|
345
344
|
|
346
345
|
// Placeholder text gets special styles; can't be bundled together though for some reason
|
347
|
-
.placeholder(
|
346
|
+
.placeholder();
|
348
347
|
|
349
348
|
|
350
349
|
|
@@ -81,10 +81,13 @@
|
|
81
81
|
// Placeholder text
|
82
82
|
// -------------------------
|
83
83
|
.placeholder(@color: @placeholderText) {
|
84
|
-
|
84
|
+
&:-moz-placeholder {
|
85
85
|
color: @color;
|
86
86
|
}
|
87
|
-
|
87
|
+
&:-ms-input-placeholder {
|
88
|
+
color: @color;
|
89
|
+
}
|
90
|
+
&::-webkit-input-placeholder {
|
88
91
|
color: @color;
|
89
92
|
}
|
90
93
|
}
|
@@ -166,6 +169,8 @@
|
|
166
169
|
color: @textColor;
|
167
170
|
}
|
168
171
|
// Style inputs accordingly
|
172
|
+
.checkbox,
|
173
|
+
.radio,
|
169
174
|
input,
|
170
175
|
select,
|
171
176
|
textarea {
|
@@ -312,6 +317,16 @@
|
|
312
317
|
column-gap: @columnGap;
|
313
318
|
}
|
314
319
|
|
320
|
+
// Optional hyphenation
|
321
|
+
.hyphens(@mode: auto) {
|
322
|
+
word-wrap: break-word;
|
323
|
+
-webkit-hyphens: @mode;
|
324
|
+
-moz-hyphens: @mode;
|
325
|
+
-ms-hyphens: @mode;
|
326
|
+
-o-hyphens: @mode;
|
327
|
+
hyphens: @mode;
|
328
|
+
}
|
329
|
+
|
315
330
|
// Opacity
|
316
331
|
.opacity(@opacity) {
|
317
332
|
opacity: @opacity / 100;
|
@@ -417,7 +432,7 @@
|
|
417
432
|
// Horizontal dividers
|
418
433
|
// -------------------------
|
419
434
|
// Dividers (basically an hr) within dropdowns and nav lists
|
420
|
-
.nav-divider() {
|
435
|
+
.nav-divider(@top: #e5e5e5, @bottom: @white) {
|
421
436
|
// IE7 needs a set width since we gave a height. Restricting just
|
422
437
|
// to IE7 to keep the 1px left/right space in other browsers.
|
423
438
|
// It is unclear where IE is getting the extra space that we need
|
@@ -427,8 +442,8 @@
|
|
427
442
|
margin: ((@baseLineHeight / 2) - 1) 1px; // 8px 1px
|
428
443
|
*margin: -5px 0 5px;
|
429
444
|
overflow: hidden;
|
430
|
-
background-color:
|
431
|
-
border-bottom: 1px solid @
|
445
|
+
background-color: @top;
|
446
|
+
border-bottom: 1px solid @bottom;
|
432
447
|
}
|
433
448
|
|
434
449
|
// Button backgrounds
|
@@ -120,16 +120,10 @@
|
|
120
120
|
color: @white;
|
121
121
|
background-color: @navbarSearchBackground;
|
122
122
|
border: 1px solid @navbarSearchBorder;
|
123
|
-
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px
|
123
|
+
.box-shadow(~"inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15)");
|
124
124
|
.transition(none);
|
125
125
|
|
126
|
-
|
127
|
-
&:-moz-placeholder {
|
128
|
-
color: @navbarSearchPlaceholderColor;
|
129
|
-
}
|
130
|
-
&::-webkit-input-placeholder {
|
131
|
-
color: @navbarSearchPlaceholderColor;
|
132
|
-
}
|
126
|
+
.placeholder(@navbarSearchPlaceholderColor);
|
133
127
|
|
134
128
|
// Focus states (we use .focused since IE7-8 and down doesn't support :focus)
|
135
129
|
&:focus,
|
@@ -9,11 +9,18 @@
|
|
9
9
|
padding-top: 0;
|
10
10
|
}
|
11
11
|
// Unfix the navbar
|
12
|
-
.navbar-fixed-top
|
12
|
+
.navbar-fixed-top,
|
13
|
+
.navbar-fixed-bottom {
|
13
14
|
position: static;
|
15
|
+
}
|
16
|
+
.navbar-fixed-top {
|
14
17
|
margin-bottom: @baseLineHeight;
|
15
18
|
}
|
16
|
-
.navbar-fixed-
|
19
|
+
.navbar-fixed-bottom {
|
20
|
+
margin-top: @baseLineHeight;
|
21
|
+
}
|
22
|
+
.navbar-fixed-top .navbar-inner,
|
23
|
+
.navbar-fixed-bottom .navbar-inner {
|
17
24
|
padding: 5px;
|
18
25
|
}
|
19
26
|
.navbar .container {
|
@@ -22,13 +22,13 @@
|
|
22
22
|
.ie7-restore-right-whitespace();
|
23
23
|
line-height: 14px;
|
24
24
|
vertical-align: text-top;
|
25
|
-
background-image: url(@iconSpritePath);
|
25
|
+
background-image: url("@{iconSpritePath}");
|
26
26
|
background-position: 14px 14px;
|
27
27
|
background-repeat: no-repeat;
|
28
28
|
|
29
29
|
}
|
30
30
|
.icon-white {
|
31
|
-
background-image: url(@iconWhiteSpritePath);
|
31
|
+
background-image: url("@{iconWhiteSpritePath}");
|
32
32
|
}
|
33
33
|
|
34
34
|
.icon-glass { background-position: 0 0; }
|