anjlab-bootstrap-rails 3.0.0.rc1 → 3.0.0.rc2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +4 -12
- data/Rakefile +3 -2
- data/app/assets/javascripts/twitter/bootstrap.js +2 -1
- data/app/assets/javascripts/twitter/bootstrap/button.js +4 -2
- data/app/assets/javascripts/twitter/bootstrap/carousel.js +6 -2
- data/app/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
- data/app/assets/javascripts/twitter/bootstrap/modal.js +19 -16
- data/app/assets/javascripts/twitter/bootstrap/popover.js +7 -5
- data/app/assets/javascripts/twitter/bootstrap/tooltip.js +39 -21
- data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +21 -19
- data/app/assets/stylesheets/twitter/bootstrap/_badges.scss +5 -5
- data/app/assets/stylesheets/twitter/bootstrap/_bootstrap.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +96 -23
- data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +24 -18
- data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +10 -11
- data/app/assets/stylesheets/twitter/bootstrap/_close.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_code.scss +4 -3
- data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +23 -18
- data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +65 -160
- data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +244 -59
- data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +127 -0
- data/app/assets/stylesheets/twitter/bootstrap/_labels.scss +12 -4
- data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +36 -36
- data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +227 -52
- data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +6 -9
- data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +268 -82
- data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +10 -18
- data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +5 -41
- data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +83 -57
- data/app/assets/stylesheets/twitter/bootstrap/_popovers.scss +0 -2
- data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +2 -8
- data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +76 -21
- data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +18 -2
- data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +2 -2
- data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +1 -1
- data/app/assets/stylesheets/twitter/bootstrap/_type.scss +19 -13
- data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +3 -2
- data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +86 -46
- data/app/assets/stylesheets/twitter/bootstrap/_wells.scss +2 -2
- data/lib/bootstrap-rails/version.rb +1 -1
- data/vendor/assets/javascripts/holder.js +419 -0
- metadata +4 -3
- data/app/assets/stylesheets/twitter/bootstrap/_accordion.scss +0 -31
@@ -6,7 +6,9 @@
|
|
6
6
|
// Reset the box-sizing
|
7
7
|
// -------------------------
|
8
8
|
|
9
|
-
|
9
|
+
*,
|
10
|
+
*:before,
|
11
|
+
*:after {
|
10
12
|
@include box-sizing(border-box);
|
11
13
|
}
|
12
14
|
|
@@ -83,7 +85,7 @@ img {
|
|
83
85
|
|
84
86
|
// Perfect circle
|
85
87
|
.img-circle {
|
86
|
-
border-radius:
|
88
|
+
border-radius: 50%; // set radius in percents
|
87
89
|
}
|
88
90
|
|
89
91
|
|
@@ -97,3 +99,17 @@ hr {
|
|
97
99
|
border-top: 1px solid $hr-border;
|
98
100
|
}
|
99
101
|
|
102
|
+
// Only display content to screen readers
|
103
|
+
// See: http://a11yproject.com/posts/how-to-hide-content/
|
104
|
+
// -------------------------
|
105
|
+
|
106
|
+
.sr-only {
|
107
|
+
position: absolute;
|
108
|
+
width: 1px;
|
109
|
+
height: 1px;
|
110
|
+
margin: -1px;
|
111
|
+
padding: 0;
|
112
|
+
overflow: hidden;
|
113
|
+
clip: rect(0 0 0 0);
|
114
|
+
border: 0;
|
115
|
+
}
|
@@ -10,7 +10,7 @@
|
|
10
10
|
// Can be `a`, `div`, or `img`
|
11
11
|
.thumbnail,
|
12
12
|
.img-thumbnail {
|
13
|
-
padding:
|
13
|
+
padding: $thumbnail-padding;
|
14
14
|
line-height: $line-height-base;
|
15
15
|
background-color: $thumbnail-bg;
|
16
16
|
border: 1px solid $thumbnail-border;
|
@@ -37,6 +37,6 @@ a.thumbnail:focus {
|
|
37
37
|
margin-right: auto;
|
38
38
|
}
|
39
39
|
.thumbnail .caption {
|
40
|
-
padding:
|
40
|
+
padding: $thumbnail-caption-padding;
|
41
41
|
color: $thumbnail-caption-color;
|
42
42
|
}
|
@@ -144,18 +144,25 @@ dt {
|
|
144
144
|
dd {
|
145
145
|
margin-left: 0; // Undo browser default
|
146
146
|
}
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
147
|
+
|
148
|
+
// Horizontal description lists
|
149
|
+
//
|
150
|
+
// Defaults to being stacked without any of the below styles applied, until the
|
151
|
+
// grid breakpoint is reached (default of ~768px).
|
152
|
+
|
153
|
+
@media (min-width: $grid-float-breakpoint) {
|
154
|
+
.dl-horizontal {
|
155
|
+
dt {
|
156
|
+
float: left;
|
157
|
+
width: ($component-offset-horizontal - 20);
|
158
|
+
clear: left;
|
159
|
+
text-align: right;
|
160
|
+
@include text-overflow();
|
161
|
+
}
|
162
|
+
dd {
|
163
|
+
margin-left: $component-offset-horizontal;
|
164
|
+
@include clearfix(); // Clear the floated `dt` if an empty `dd` is present
|
165
|
+
}
|
159
166
|
}
|
160
167
|
}
|
161
168
|
|
@@ -198,7 +205,6 @@ blockquote {
|
|
198
205
|
|
199
206
|
// Float right with text-align: right
|
200
207
|
&.pull-right {
|
201
|
-
float: right;
|
202
208
|
padding-right: 15px;
|
203
209
|
padding-left: 0;
|
204
210
|
border-right: 5px solid $blockquote-border-color;
|
@@ -2,12 +2,13 @@
|
|
2
2
|
// Variables
|
3
3
|
// --------------------------------------------------
|
4
4
|
|
5
|
+
|
5
6
|
// Media queries breakpoints
|
6
7
|
// --------------------------------------------------
|
7
8
|
|
8
|
-
//
|
9
|
-
$screen-
|
10
|
-
$screen-phone: $screen-
|
9
|
+
// Extra small screen / phone
|
10
|
+
$screen-xsmall: 480px !default;
|
11
|
+
$screen-phone: $screen-xsmall !default;
|
11
12
|
|
12
13
|
// Small screen / tablet
|
13
14
|
$screen-small: 768px !default;
|
@@ -17,26 +18,15 @@ $screen-tablet: $screen-small !default;
|
|
17
18
|
$screen-medium: 992px !default;
|
18
19
|
$screen-desktop: $screen-medium !default;
|
19
20
|
|
20
|
-
// So media queries don't overlap when required, provide a maximum
|
21
|
-
$screen-small-max: ($screen-medium - 1) !default;
|
22
|
-
$screen-tablet-max: $screen-small-max !default;
|
23
|
-
|
24
21
|
// Large screen / wide desktop
|
25
22
|
$screen-large: 1200px !default;
|
26
23
|
$screen-large-desktop: $screen-large !default;
|
27
24
|
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
$container-tablet: 728px !default;
|
34
|
-
|
35
|
-
// Medium screen / desktop
|
36
|
-
$container-desktop: 940px !default;
|
37
|
-
|
38
|
-
// Large screen / wide desktop
|
39
|
-
$container-large-desktop: 1170px !default;
|
25
|
+
// So media queries don't overlap when required, provide a maximum
|
26
|
+
$screen-phone-max: ($screen-small - 1) !default;
|
27
|
+
$screen-small-max: ($screen-medium - 1) !default;
|
28
|
+
$screen-tablet-max: ($screen-desktop - 1) !default;
|
29
|
+
$screen-desktop-max: ($screen-large-desktop - 1) !default;
|
40
30
|
|
41
31
|
|
42
32
|
// Grid system
|
@@ -49,6 +39,7 @@ $grid-gutter-width: 30px !default;
|
|
49
39
|
// Point at which the navbar stops collapsing
|
50
40
|
$grid-float-breakpoint: $screen-tablet !default;
|
51
41
|
|
42
|
+
|
52
43
|
// Grays
|
53
44
|
// -------------------------
|
54
45
|
|
@@ -103,21 +94,26 @@ $headings-line-height: 1.1 !default;
|
|
103
94
|
// -------------------------
|
104
95
|
// Based on 14px font-size and 1.428 line-height (~20px to start)
|
105
96
|
|
106
|
-
$padding-base-vertical:
|
97
|
+
$padding-base-vertical: 6px !default;
|
107
98
|
$padding-base-horizontal: 12px !default;
|
108
99
|
|
109
|
-
$padding-large-vertical:
|
100
|
+
$padding-large-vertical: 10px !default;
|
110
101
|
$padding-large-horizontal: 16px !default;
|
111
102
|
|
112
103
|
$padding-small-vertical: 5px !default;
|
113
104
|
$padding-small-horizontal: 10px !default;
|
114
105
|
|
106
|
+
$line-height-large: 1.33 !default;
|
107
|
+
$line-height-small: 1.5 !default;
|
108
|
+
|
115
109
|
$border-radius-base: 4px !default;
|
116
110
|
$border-radius-large: 6px !default;
|
117
111
|
$border-radius-small: 3px !default;
|
118
112
|
|
119
113
|
$component-active-bg: $brand-primary !default;
|
120
114
|
|
115
|
+
$caret-width-base: 4px !default;
|
116
|
+
$caret-width-large: 5px !default;
|
121
117
|
|
122
118
|
// Tables
|
123
119
|
// -------------------------
|
@@ -136,31 +132,33 @@ $table-border-color: #ddd !default; // table and cell border
|
|
136
132
|
// Buttons
|
137
133
|
// -------------------------
|
138
134
|
|
139
|
-
$btn-
|
140
|
-
|
141
|
-
$btn-default-
|
135
|
+
$btn-font-weight: bold !default;
|
136
|
+
|
137
|
+
$btn-default-color: #333 !default;
|
138
|
+
$btn-default-bg: #fff !default;
|
139
|
+
$btn-default-border: #ccc !default;
|
142
140
|
|
143
|
-
$btn-primary-color:
|
141
|
+
$btn-primary-color: #fff !default;
|
144
142
|
$btn-primary-bg: $brand-primary !default;
|
145
|
-
$btn-primary-border: $btn-primary-bg !default;
|
143
|
+
$btn-primary-border: darken($btn-primary-bg, 5%) !default;
|
146
144
|
|
147
|
-
$btn-success-color:
|
145
|
+
$btn-success-color: #fff !default;
|
148
146
|
$btn-success-bg: $brand-success !default;
|
149
|
-
$btn-success-border: $btn-success-bg !default;
|
147
|
+
$btn-success-border: darken($btn-success-bg, 5%) !default;
|
150
148
|
|
151
|
-
$btn-warning-color:
|
149
|
+
$btn-warning-color: #fff !default;
|
152
150
|
$btn-warning-bg: $brand-warning !default;
|
153
|
-
$btn-warning-border: $btn-warning-bg !default;
|
151
|
+
$btn-warning-border: darken($btn-warning-bg, 5%) !default;
|
154
152
|
|
155
|
-
$btn-danger-color:
|
153
|
+
$btn-danger-color: #fff !default;
|
156
154
|
$btn-danger-bg: $brand-danger !default;
|
157
|
-
$btn-danger-border: $btn-danger-bg !default;
|
155
|
+
$btn-danger-border: darken($btn-danger-bg, 5%) !default;
|
158
156
|
|
159
|
-
$btn-info-color:
|
157
|
+
$btn-info-color: #fff !default;
|
160
158
|
$btn-info-bg: $brand-info !default;
|
161
|
-
$btn-info-border: $btn-info-bg !default;
|
159
|
+
$btn-info-border: darken($btn-info-bg, 5%) !default;
|
162
160
|
|
163
|
-
$btn-
|
161
|
+
$btn-link-disabled-color: $gray-light !default;
|
164
162
|
|
165
163
|
|
166
164
|
// Forms
|
@@ -169,17 +167,21 @@ $btn-hover-color: $btn-default-color !default;
|
|
169
167
|
$input-bg: #fff !default;
|
170
168
|
$input-bg-disabled: $gray-lighter !default;
|
171
169
|
|
170
|
+
$input-color: $gray !default;
|
172
171
|
$input-border: #ccc !default;
|
173
172
|
$input-border-radius: $border-radius-base !default;
|
173
|
+
$input-border-focus: #66afe9 !default;
|
174
174
|
|
175
175
|
$input-color-placeholder: $gray-light !default;
|
176
176
|
|
177
|
-
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2);
|
178
|
-
$input-height-large: (
|
179
|
-
$input-height-small: (
|
177
|
+
$input-height-base: ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
|
178
|
+
$input-height-large: (floor($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
|
179
|
+
$input-height-small: (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
|
180
180
|
|
181
|
+
$legend-color: $gray-dark !default;
|
181
182
|
$legend-border-color: #e5e5e5 !default;
|
182
183
|
|
184
|
+
$input-group-addon-bg: $gray-lighter !default;
|
183
185
|
$input-group-addon-border-color: $input-border !default;
|
184
186
|
|
185
187
|
|
@@ -198,6 +200,10 @@ $dropdown-link-color: $gray-dark !default;
|
|
198
200
|
$dropdown-link-hover-color: #fff !default;
|
199
201
|
$dropdown-link-hover-bg: $dropdown-link-active-bg !default;
|
200
202
|
|
203
|
+
$dropdown-link-disabled-color: $gray-light !default;
|
204
|
+
|
205
|
+
$dropdown-header-color: $gray-light !default;
|
206
|
+
|
201
207
|
$dropdown-caret-color: #000 !default;
|
202
208
|
|
203
209
|
|
@@ -224,9 +230,12 @@ $zindex-modal: 1050 !default;
|
|
224
230
|
|
225
231
|
// Basics of a navbar
|
226
232
|
$navbar-height: 50px !default;
|
233
|
+
$navbar-margin-bottom: $line-height-computed !default;
|
227
234
|
$navbar-color: #777 !default;
|
228
|
-
$navbar-bg: #
|
229
|
-
$navbar-
|
235
|
+
$navbar-bg: #f8f8f8 !default;
|
236
|
+
$navbar-border: darken($navbar-bg, 6.5%) !default;
|
237
|
+
$navbar-border-radius: $border-radius-base !default;
|
238
|
+
$navbar-padding-horizontal: floor($grid-gutter-width / 2) !default;
|
230
239
|
$navbar-padding-vertical: (($navbar-height - $line-height-computed) / 2) !default;
|
231
240
|
|
232
241
|
// Navbar links
|
@@ -234,7 +243,7 @@ $navbar-link-color: #777 !default;
|
|
234
243
|
$navbar-link-hover-color: #333 !default;
|
235
244
|
$navbar-link-hover-bg: transparent !default;
|
236
245
|
$navbar-link-active-color: #555 !default;
|
237
|
-
$navbar-link-active-bg: darken($navbar-bg,
|
246
|
+
$navbar-link-active-bg: darken($navbar-bg, 6.5%) !default;
|
238
247
|
$navbar-link-disabled-color: #ccc !default;
|
239
248
|
$navbar-link-disabled-bg: transparent !default;
|
240
249
|
|
@@ -253,6 +262,7 @@ $navbar-toggle-border-color: #ddd !default;
|
|
253
262
|
// Reset inverted navbar basics
|
254
263
|
$navbar-inverse-color: $gray-light !default;
|
255
264
|
$navbar-inverse-bg: #222 !default;
|
265
|
+
$navbar-inverse-border: darken($navbar-inverse-bg, 10%) !default;
|
256
266
|
|
257
267
|
// Inverted navbar links
|
258
268
|
$navbar-inverse-link-color: $gray-light !default;
|
@@ -357,7 +367,7 @@ $state-info-border: darken(adjust-hue($state-info-bg, -10%), 7%) !d
|
|
357
367
|
// -------------------------
|
358
368
|
$tooltip-max-width: 200px !default;
|
359
369
|
$tooltip-color: #fff !default;
|
360
|
-
$tooltip-bg:
|
370
|
+
$tooltip-bg: #000 !default;
|
361
371
|
|
362
372
|
$tooltip-arrow-width: 5px !default;
|
363
373
|
$tooltip-arrow-color: $tooltip-bg !default;
|
@@ -382,6 +392,8 @@ $popover-arrow-outer-fallback-color: #999 !default;
|
|
382
392
|
|
383
393
|
// Labels
|
384
394
|
// -------------------------
|
395
|
+
|
396
|
+
$label-default-bg: $gray-light !default;
|
385
397
|
$label-success-bg: $brand-success !default;
|
386
398
|
$label-info-bg: $brand-info !default;
|
387
399
|
$label-warning-bg: $brand-warning !default;
|
@@ -409,10 +421,13 @@ $modal-footer-border-color: $modal-header-border-color !default;
|
|
409
421
|
|
410
422
|
// Alerts
|
411
423
|
// -------------------------
|
424
|
+
$alert-padding: 15px !default;
|
425
|
+
$alert-border-radius: $border-radius-base !default;
|
426
|
+
$alert-link-font-weight: bold !default;
|
427
|
+
|
412
428
|
$alert-bg: $state-warning-bg !default;
|
413
429
|
$alert-text: $state-warning-text !default;
|
414
430
|
$alert-border: $state-warning-border !default;
|
415
|
-
$alert-border-radius: $border-radius-base !default;
|
416
431
|
|
417
432
|
$alert-success-bg: $state-success-bg !default;
|
418
433
|
$alert-success-text: $state-success-text !default;
|
@@ -485,10 +500,12 @@ $panel-info-heading-bg: $state-info-bg !default;
|
|
485
500
|
|
486
501
|
// Thumbnails
|
487
502
|
// -------------------------
|
488
|
-
$thumbnail-
|
503
|
+
$thumbnail-padding: 4px !default;
|
489
504
|
$thumbnail-bg: $body-bg !default;
|
490
505
|
$thumbnail-border: #ddd !default;
|
491
506
|
$thumbnail-border-radius: $border-radius-base !default;
|
507
|
+
$thumbnail-caption-color: $text-color !default;
|
508
|
+
$thumbnail-caption-padding: 9px !default;
|
492
509
|
|
493
510
|
|
494
511
|
// Wells
|
@@ -505,11 +522,15 @@ $accordion-border-color: #e5e5e5 !default;
|
|
505
522
|
// -------------------------
|
506
523
|
$badge-color: #fff !default;
|
507
524
|
$badge-link-hover-color: #fff !default;
|
508
|
-
|
509
525
|
$badge-bg: $gray-light !default;
|
526
|
+
|
510
527
|
$badge-active-color: $link-color !default;
|
511
528
|
$badge-active-bg: #fff !default;
|
512
529
|
|
530
|
+
$badge-font-weight: bold !default;
|
531
|
+
$badge-line-height: 1 !default;
|
532
|
+
$badge-border-radius: 10px !default;
|
533
|
+
|
513
534
|
|
514
535
|
// Breadcrumbs
|
515
536
|
// -------------------------
|
@@ -523,9 +544,12 @@ $breadcrumb-active-color: $gray-light !default;
|
|
523
544
|
$carousel-text-shadow: 0 1px 2px rgba(0,0,0,.6) !default;
|
524
545
|
|
525
546
|
$carousel-control-color: #fff !default;
|
547
|
+
$carousel-control-width: 15% !default;
|
548
|
+
$carousel-control-opacity: .5 !default;
|
549
|
+
$carousel-control-font-size: 20px !default;
|
526
550
|
|
527
|
-
$carousel-indicator-border-color: #fff !default;
|
528
551
|
$carousel-indicator-active-bg: #fff !default;
|
552
|
+
$carousel-indicator-border-color: #fff !default;
|
529
553
|
|
530
554
|
$carousel-caption-color: #fff !default;
|
531
555
|
|
@@ -533,6 +557,7 @@ $carousel-caption-color: #fff !default;
|
|
533
557
|
// Close
|
534
558
|
// ------------------------
|
535
559
|
$close-color: #000 !default;
|
560
|
+
$close-font-weight: bold !default;
|
536
561
|
$close-text-shadow: 0 1px 0 #fff !default;
|
537
562
|
|
538
563
|
|
@@ -542,7 +567,9 @@ $code-color: #c7254e !default;
|
|
542
567
|
$code-bg: #f9f2f4 !default;
|
543
568
|
|
544
569
|
$pre-bg: #f5f5f5 !default;
|
570
|
+
$pre-color: $gray-dark !default;
|
545
571
|
$pre-border-color: #ccc !default;
|
572
|
+
$pre-scrollable-max-height: 340px !default;
|
546
573
|
|
547
574
|
// Type
|
548
575
|
// ------------------------
|
@@ -561,3 +588,16 @@ $hr-border: $gray-lighter !default;
|
|
561
588
|
|
562
589
|
// Horizontal forms & lists
|
563
590
|
$component-offset-horizontal: 180px !default;
|
591
|
+
|
592
|
+
|
593
|
+
// Container sizes
|
594
|
+
// --------------------------------------------------
|
595
|
+
|
596
|
+
// Small screen / tablet
|
597
|
+
$container-tablet: 720px !default;
|
598
|
+
|
599
|
+
// Medium screen / desktop
|
600
|
+
$container-desktop: 940px !default;
|
601
|
+
|
602
|
+
// Large screen / wide desktop
|
603
|
+
$container-large-desktop: 1140px !default;
|