anjlab-bootstrap-rails 3.0.0.3 → 3.0.1.0

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.
Files changed (49) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +1 -1
  3. data/Rakefile +0 -1
  4. data/app/assets/fonts/twitter/glyphicons-halflings-regular.eot +0 -0
  5. data/app/assets/fonts/twitter/glyphicons-halflings-regular.svg +200 -199
  6. data/app/assets/fonts/twitter/glyphicons-halflings-regular.ttf +0 -0
  7. data/app/assets/fonts/twitter/glyphicons-halflings-regular.woff +0 -0
  8. data/app/assets/javascripts/twitter/bootstrap.js +1 -2
  9. data/app/assets/javascripts/twitter/bootstrap/affix.js +3 -3
  10. data/app/assets/javascripts/twitter/bootstrap/alert.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/button.js +2 -2
  12. data/app/assets/javascripts/twitter/bootstrap/carousel.js +3 -3
  13. data/app/assets/javascripts/twitter/bootstrap/collapse.js +3 -3
  14. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +3 -3
  15. data/app/assets/javascripts/twitter/bootstrap/modal.js +3 -3
  16. data/app/assets/javascripts/twitter/bootstrap/popover.js +3 -3
  17. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +3 -3
  18. data/app/assets/javascripts/twitter/bootstrap/tab.js +4 -4
  19. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +3 -3
  20. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  21. data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
  22. data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +1 -1
  23. data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +6 -1
  24. data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +1 -4
  25. data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +12 -1
  26. data/app/assets/stylesheets/twitter/bootstrap/_code.scss +3 -3
  27. data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +1 -2
  28. data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +10 -9
  29. data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +13 -12
  30. data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +22 -275
  31. data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +1 -1
  32. data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +15 -0
  33. data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +91 -18
  34. data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +1 -7
  35. data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +9 -6
  36. data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +32 -18
  37. data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +4 -0
  38. data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
  39. data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +2 -6
  40. data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +0 -10
  41. data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -1
  42. data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +15 -25
  43. data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +3 -1
  44. data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +5 -6
  45. data/app/assets/stylesheets/twitter/bootstrap/_type.scss +20 -12
  46. data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +11 -0
  47. data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +3 -3
  48. data/lib/bootstrap-rails/version.rb +1 -1
  49. metadata +2 -2
@@ -6,7 +6,7 @@
6
6
  .jumbotron {
7
7
  padding: $jumbotron-padding;
8
8
  margin-bottom: $jumbotron-padding;
9
- font-size: ($font-size-base * 1.5);
9
+ font-size: $jumbotron-font-size;
10
10
  font-weight: 200;
11
11
  line-height: ($line-height-base * 1.5);
12
12
  color: $jumbotron-color;
@@ -39,7 +39,22 @@
39
39
  > .badge + .badge {
40
40
  margin-right: 5px;
41
41
  }
42
+ }
43
+
44
+ // Linked list items
45
+ a.list-group-item {
46
+ color: $list-group-link-color;
42
47
 
48
+ .list-group-item-heading {
49
+ color: $list-group-link-heading-color;
50
+ }
51
+
52
+ // Hover state
53
+ &:hover,
54
+ &:focus {
55
+ text-decoration: none;
56
+ background-color: $list-group-hover-bg;
57
+ }
43
58
 
44
59
  // Active class on item itself, not parent
45
60
  &.active,
@@ -27,11 +27,11 @@
27
27
  }
28
28
  }
29
29
 
30
- // Webkit-style focus
30
+ // WebKit-style focus
31
31
  @mixin tab-focus() {
32
32
  // Default
33
33
  outline: thin dotted #333;
34
- // Webkit
34
+ // WebKit
35
35
  outline: 5px auto -webkit-focus-ring-color;
36
36
  outline-offset: -2px;
37
37
  }
@@ -192,17 +192,22 @@
192
192
  -moz-perspective-origin: $perspective;
193
193
  perspective-origin: $perspective;
194
194
  }
195
- @mixin transform-origin($origin){
195
+
196
+ @mixin transform-origin($origin) {
196
197
  -webkit-transform-origin: $origin;
197
198
  -moz-transform-origin: $origin;
198
199
  transform-origin: $origin;
199
200
  }
200
201
 
202
+ // Animations
203
+ @mixin animation($animation) {
204
+ -webkit-animation: $animation;
205
+ animation: $animation;
206
+ }
201
207
 
202
208
  // Backface visibility
203
209
  // Prevent browsers from flickering when using CSS 3D transforms.
204
210
  // Default value is `visible`, but can be changed to `hidden`
205
- // See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
206
211
  @mixin backface-visibility($visibility){
207
212
  -webkit-backface-visibility: $visibility;
208
213
  -moz-backface-visibility: $visibility;
@@ -284,13 +289,12 @@
284
289
  // Color stops are not available in IE9 and below.
285
290
  @mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
286
291
  background-image: -webkit-gradient(linear, left $start-percent, left $end-percent, from($start-color), to($end-color)); // Safari 4+, Chrome 2+
287
- background-image: -webkit-linear-gradient(top, $start-color, $start-percent, $end-color, $end-percent); // Safari 5.1+, Chrome 10+
292
+ background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // Safari 5.1+, Chrome 10+
288
293
  background-image: -moz-linear-gradient(top, $start-color $start-percent, $end-color $end-percent); // FF 3.6+
289
294
  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10
290
295
  background-repeat: repeat-x;
291
296
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
292
297
  }
293
-
294
298
  @mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
295
299
  background-repeat: repeat-x;
296
300
  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1+, Chrome 10+
@@ -306,7 +310,6 @@
306
310
  background-repeat: no-repeat;
307
311
  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
308
312
  }
309
-
310
313
  @mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
311
314
  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($start-color), color-stop($color-stop, $mid-color), to($end-color));
312
315
  background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
@@ -387,13 +390,18 @@
387
390
  // -------------------------
388
391
  @mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
389
392
  border-color: $border;
393
+
390
394
  & > .panel-heading {
391
395
  color: $heading-text-color;
392
396
  background-color: $heading-bg-color;
393
397
  border-color: $heading-border;
398
+
394
399
  + .panel-collapse .panel-body {
395
400
  border-top-color: $border;
396
401
  }
402
+ & > .dropdown .caret {
403
+ border-color: $heading-text-color transparent;
404
+ }
397
405
  }
398
406
  & > .panel-footer {
399
407
  + .panel-collapse .panel-body {
@@ -408,6 +416,7 @@
408
416
  background-color: $background;
409
417
  border-color: $border;
410
418
  color: $text-color;
419
+
411
420
  hr {
412
421
  border-top-color: darken($border, 5%);
413
422
  }
@@ -424,24 +433,22 @@
424
433
  .table > thead > tr,
425
434
  .table > tbody > tr,
426
435
  .table > tfoot > tr {
427
- > td.#{$state},
428
- > th.#{$state},
429
- &.#{$state} > td,
430
- &.#{$state} > th {
436
+ > td.#{state},
437
+ > th.#{state},
438
+ &.#{state} > td,
439
+ &.#{state} > th {
431
440
  background-color: $background;
432
- border-color: $border;
433
441
  }
434
442
  }
435
443
 
436
444
  // Hover states for `.table-hover`
437
445
  // Note: this is not available for cells or rows within `thead` or `tfoot`.
438
446
  .table-hover > tbody > tr {
439
- > td.#{$state}:hover,
440
- > th.#{$state}:hover,
441
- &.#{$state}:hover > td,
442
- &.#{$state}:hover > th {
447
+ > td.#{state}:hover,
448
+ > th.#{state}:hover,
449
+ &.#{state}:hover > td,
450
+ &.#{state}:hover > th {
443
451
  background-color: darken($background, 5%);
444
- border-color: darken($border, 5%);
445
452
  }
446
453
  }
447
454
  }
@@ -568,6 +575,7 @@
568
575
  td#{$selector} { display: none !important; }
569
576
  }
570
577
 
578
+
571
579
  // Grid System
572
580
  // -----------
573
581
 
@@ -699,6 +707,67 @@
699
707
  }
700
708
 
701
709
 
710
+ // Framework grid generation
711
+ //
712
+ // Used only by Bootstrap to generate the correct number of grid classes given
713
+ // any value of `$grid-columns`.
714
+
715
+ @function make-columns-selector($classes: (xs, sm, md, lg), $columns: $grid-columns) {
716
+ $list: ();
717
+ @for $i from 1 through $columns {
718
+ @each $class in $classes {
719
+ $list: append($list, unquote(".col-#{$class}-#{$i}"), comma);
720
+ }
721
+ }
722
+ @return $list;
723
+ }
724
+
725
+ @mixin make-grid-columns($list: make-columns-selector()) {
726
+ // Common styles for all sizes of grid columns, widths 1-12
727
+
728
+ #{$list} {
729
+ position: relative;
730
+ // Prevent columns from collapsing when empty
731
+ min-height: 1px;
732
+ // Inner gutter via padding
733
+ padding-left: ($grid-gutter-width / 2);
734
+ padding-right: ($grid-gutter-width / 2);
735
+ }
736
+ }
737
+
738
+ @mixin make-grid-columns-float($class) {
739
+ $list: make-columns-selector($class, $grid-columns - 1);
740
+
741
+ #{$list} {
742
+ float: left;
743
+ }
744
+ }
745
+
746
+ @mixin calc-grid($index, $class, $type) {
747
+ $specifier: '';
748
+ @if $type != width {
749
+ $specifier: "-#{$type}"
750
+ }
751
+ .col-#{$class}#{$specifier}-#{$index} {
752
+ @if $type == width {
753
+ width: percentage(($index / $grid-columns));
754
+ } @else if $type == push {
755
+ left: percentage(($index / $grid-columns));
756
+ } @else if $type == pull {
757
+ right: percentage(($index / $grid-columns));
758
+ } @else if $type == offset {
759
+ margin-left: percentage(($index / $grid-columns));
760
+ }
761
+ }
762
+ }
763
+
764
+ @mixin make-grid($columns, $class, $type) {
765
+ @for $i from 1 through $columns {
766
+ @include calc-grid($i, $class, $type);
767
+ }
768
+ }
769
+
770
+
702
771
  // Form validation states
703
772
  //
704
773
  // Used in forms.less to generate the form validation CSS for warnings, errors,
@@ -707,7 +776,11 @@
707
776
  @mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
708
777
  // Color the label and help text
709
778
  .help-block,
710
- .control-label {
779
+ .control-label,
780
+ .radio,
781
+ .checkbox,
782
+ .radio-inline,
783
+ .checkbox-inline {
711
784
  color: $text-color;
712
785
  }
713
786
  // Set the border and box shadow on specific inputs to match
@@ -12,13 +12,6 @@
12
12
  overflow: hidden;
13
13
  }
14
14
 
15
- // Account for hiding of scrollbar
16
- body.modal-open,
17
- .modal-open .navbar-fixed-top,
18
- .modal-open .navbar-fixed-bottom {
19
- margin-right: 15px
20
- }
21
-
22
15
  // Container that the modal scrolls within
23
16
  .modal {
24
17
  display: none;
@@ -41,6 +34,7 @@ body.modal-open,
41
34
 
42
35
  // Shell div to position the modal with bottom padding
43
36
  .modal-dialog {
37
+ position: relative;
44
38
  margin-left: auto;
45
39
  margin-right: auto;
46
40
  width: auto;
@@ -10,7 +10,6 @@
10
10
 
11
11
  .navbar {
12
12
  position: relative;
13
- z-index: $zindex-navbar;
14
13
  min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
15
14
  margin-bottom: $navbar-margin-bottom;
16
15
  border: 1px solid transparent;
@@ -75,7 +74,7 @@
75
74
  }
76
75
 
77
76
  &.in {
78
- overflow-y: visible;
77
+ overflow-y: auto;
79
78
  }
80
79
 
81
80
  // Account for first and last children spacing
@@ -111,12 +110,14 @@
111
110
  //
112
111
  // Navbar alignment options
113
112
  //
114
- // Display the navbar across the entirity of the page or fixed it to the top or
113
+ // Display the navbar across the entirety of the page or fixed it to the top or
115
114
  // bottom of the page.
116
115
 
117
116
  // Static top (unfixed, but 100% wide) navbar
118
117
  .navbar-static-top {
118
+ z-index: $zindex-navbar;
119
119
  border-width: 0 0 1px;
120
+
120
121
  @media (min-width: $grid-float-breakpoint) {
121
122
  border-radius: 0;
122
123
  }
@@ -128,7 +129,7 @@
128
129
  position: fixed;
129
130
  right: 0;
130
131
  left: 0;
131
- border-width: 0 0 1px;
132
+ z-index: $zindex-navbar-fixed;
132
133
 
133
134
  // Undo the rounded corners
134
135
  @media (min-width: $grid-float-breakpoint) {
@@ -136,12 +137,13 @@
136
137
  }
137
138
  }
138
139
  .navbar-fixed-top {
139
- z-index: $zindex-navbar-fixed;
140
140
  top: 0;
141
+ border-width: 0 0 1px;
141
142
  }
142
143
  .navbar-fixed-bottom {
143
144
  bottom: 0;
144
145
  margin-bottom: 0; // override .navbar defaults
146
+ border-width: 1px 0 0;
145
147
  }
146
148
 
147
149
 
@@ -152,6 +154,7 @@
152
154
  padding: $navbar-padding-vertical $navbar-padding-horizontal;
153
155
  font-size: $font-size-large;
154
156
  line-height: $line-height-computed;
157
+
155
158
  &:hover,
156
159
  &:focus {
157
160
  text-decoration: none;
@@ -254,7 +257,7 @@
254
257
 
255
258
  // Component alignment
256
259
  //
257
- // Repurpose the pull utilities as their own navbar utilities to avoid specifity
260
+ // Repurpose the pull utilities as their own navbar utilities to avoid specificity
258
261
  // issues with parents and chaining. Only do this when the navbar is uncollapsed
259
262
  // though so that navbar contents properly stack and align in mobile.
260
263
 
@@ -48,6 +48,11 @@
48
48
  &:focus {
49
49
  background-color: $nav-link-hover-bg;
50
50
  border-color: $link-color;
51
+
52
+ .caret {
53
+ border-top-color: $link-hover-color;
54
+ border-bottom-color: $link-hover-color;
55
+ }
51
56
  }
52
57
  }
53
58
 
@@ -78,6 +83,11 @@
78
83
  }
79
84
  }
80
85
 
86
+ > .dropdown .dropdown-menu {
87
+ top: auto;
88
+ left: auto;
89
+ }
90
+
81
91
  @media (min-width: $screen-sm-min) {
82
92
  > li {
83
93
  display: table-cell;
@@ -90,6 +100,8 @@
90
100
  }
91
101
 
92
102
  // Move borders to anchors instead of bottom of list
103
+ //
104
+ // Mixin for adding on top the shared `.nav-justified` styles for our tabs
93
105
  @mixin nav-tabs-justified {
94
106
  border-bottom: 0;
95
107
 
@@ -105,11 +117,16 @@
105
117
  border: 1px solid $nav-tabs-justified-link-border-color;
106
118
  }
107
119
 
108
- // Prevent IE8 from misplacing imgs
109
- //
110
- // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
111
- > li > a > img {
112
- max-width: none;
120
+ @media (min-width: $screen-sm-min) {
121
+ > li > a {
122
+ border-bottom: 1px solid $nav-tabs-justified-link-border-color;
123
+ border-radius: $border-radius-base $border-radius-base 0 0;
124
+ }
125
+ > .active > a,
126
+ > .active > a:hover,
127
+ > .active > a:focus {
128
+ border-bottom-color: $nav-tabs-justified-active-link-border-color;
129
+ }
113
130
  }
114
131
  }
115
132
 
@@ -178,6 +195,11 @@
178
195
  &:focus {
179
196
  color: $nav-pills-active-link-hover-color;
180
197
  background-color: $nav-pills-active-link-hover-bg;
198
+
199
+ .caret {
200
+ border-top-color: $nav-pills-active-link-hover-color;
201
+ border-bottom-color: $nav-pills-active-link-hover-color;
202
+ }
181
203
  }
182
204
  }
183
205
  }
@@ -200,25 +222,17 @@
200
222
  // Tabbable tabs
201
223
  // -------------------------
202
224
 
203
- // Clear any floats
204
- .tabbable {
205
- @include clearfix();
206
- }
207
-
208
- // Show/hide tabbable areas
209
- .tab-content > .tab-pane,
210
- .pill-content > .pill-pane {
211
- display: none;
212
- }
213
- .tab-content,
214
- .pill-content {
225
+ // Hide tabbable panes to start, show them when `.active`
226
+ .tab-content {
227
+ > .tab-pane {
228
+ display: none;
229
+ }
215
230
  > .active {
216
231
  display: block;
217
232
  }
218
233
  }
219
234
 
220
235
 
221
-
222
236
  // Dropdowns
223
237
  // -------------------------
224
238
 
@@ -95,6 +95,10 @@
95
95
  padding: 10px 15px;
96
96
  border-bottom: 1px solid transparent;
97
97
  @include border-top-radius($panel-border-radius - 1);
98
+
99
+ > .dropdown .dropdown-toggle {
100
+ color: inherit;
101
+ }
98
102
  }
99
103
 
100
104
  // Within heading, strip any `h*` tag of it's default margins for spacing.
@@ -26,7 +26,6 @@
26
26
  }
27
27
 
28
28
  // Don't show links for images, or javascript/internal links
29
- .ir a:after,
30
29
  a[href^="javascript:"]:after,
31
30
  a[href^="#"]:after {
32
31
  content: "";
@@ -67,6 +66,12 @@
67
66
  page-break-after: avoid;
68
67
  }
69
68
 
69
+ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
70
+ // Once fixed, we can just straight up remove this.
71
+ select {
72
+ background: #fff !important;
73
+ }
74
+
70
75
  // Bootstrap components
71
76
  .navbar {
72
77
  display: none;