anjlab-bootstrap-rails 2.1.1.1 → 2.2.0.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 (46) hide show
  1. data/lib/bootstrap-rails/version.rb +1 -1
  2. data/vendor/assets/javascripts/twitter/bootstrap/affix.js +4 -2
  3. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +2 -4
  4. data/vendor/assets/javascripts/twitter/bootstrap/button.js +5 -7
  5. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +12 -12
  6. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +9 -11
  7. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +9 -11
  8. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +20 -25
  9. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +1 -1
  10. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +1 -1
  11. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +5 -7
  12. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +12 -11
  13. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +5 -5
  14. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +19 -9
  15. data/vendor/frameworks/twitter/bootstrap/accordion.scss +1 -1
  16. data/vendor/frameworks/twitter/bootstrap/alerts.scss +1 -1
  17. data/vendor/frameworks/twitter/bootstrap/bootstrap.scss +2 -1
  18. data/vendor/frameworks/twitter/bootstrap/breadcrumbs.scss +1 -1
  19. data/vendor/frameworks/twitter/bootstrap/button-groups.scss +3 -6
  20. data/vendor/frameworks/twitter/bootstrap/buttons.scss +15 -14
  21. data/vendor/frameworks/twitter/bootstrap/code.scss +1 -1
  22. data/vendor/frameworks/twitter/bootstrap/dropdowns.scss +32 -5
  23. data/vendor/frameworks/twitter/bootstrap/forms.scss +46 -13
  24. data/vendor/frameworks/twitter/bootstrap/hero-unit.scss +6 -5
  25. data/vendor/frameworks/twitter/bootstrap/labels-badges.scss +4 -2
  26. data/vendor/frameworks/twitter/bootstrap/media.scss +55 -0
  27. data/vendor/frameworks/twitter/bootstrap/mixins.scss +9 -3
  28. data/vendor/frameworks/twitter/bootstrap/modals.scss +7 -11
  29. data/vendor/frameworks/twitter/bootstrap/navbar.scss +4 -4
  30. data/vendor/frameworks/twitter/bootstrap/navs.scss +3 -2
  31. data/vendor/frameworks/twitter/bootstrap/pager.scss +10 -9
  32. data/vendor/frameworks/twitter/bootstrap/pagination.scss +69 -12
  33. data/vendor/frameworks/twitter/bootstrap/popovers.scss +2 -2
  34. data/vendor/frameworks/twitter/bootstrap/progress-bars.scss +1 -1
  35. data/vendor/frameworks/twitter/bootstrap/reset.scss +5 -4
  36. data/vendor/frameworks/twitter/bootstrap/responsive-767px-max.scss +20 -1
  37. data/vendor/frameworks/twitter/bootstrap/responsive-navbar.scss +11 -3
  38. data/vendor/frameworks/twitter/bootstrap/responsive.scss +1 -1
  39. data/vendor/frameworks/twitter/bootstrap/sprites.scss +3 -3
  40. data/vendor/frameworks/twitter/bootstrap/tables.scss +10 -8
  41. data/vendor/frameworks/twitter/bootstrap/thumbnails.scss +1 -1
  42. data/vendor/frameworks/twitter/bootstrap/tooltip.scss +1 -1
  43. data/vendor/frameworks/twitter/bootstrap/type.scss +30 -24
  44. data/vendor/frameworks/twitter/bootstrap/variables.scss +25 -3
  45. data/vendor/frameworks/twitter/bootstrap/wells.scss +3 -3
  46. metadata +5 -4
@@ -0,0 +1,55 @@
1
+ // Media objects
2
+ // Source: http://stubbornella.org/content/?p=497
3
+ // --------------------------------------------------
4
+
5
+
6
+ // Common styles
7
+ // -------------------------
8
+
9
+ // Clear the floats
10
+ .media,
11
+ .media-body {
12
+ overflow: hidden;
13
+ *overflow: visible;
14
+ zoom: 1;
15
+ }
16
+
17
+ // Proper spacing between instances of .media
18
+ .media,
19
+ .media .media {
20
+ margin-top: 15px;
21
+ }
22
+ .media:first-child {
23
+ margin-top: 0;
24
+ }
25
+
26
+ // For images and videos, set to block
27
+ .media-object {
28
+ display: block;
29
+ }
30
+
31
+ // Reset margins on headings for tighter default spacing
32
+ .media-heading {
33
+ margin: 0 0 5px;
34
+ }
35
+
36
+
37
+ // Media image alignment
38
+ // -------------------------
39
+
40
+ .media .pull-left {
41
+ margin-right: 10px;
42
+ }
43
+ .media .pull-right {
44
+ margin-left: 10px;
45
+ }
46
+
47
+
48
+ // Media list variation
49
+ // -------------------------
50
+
51
+ // Undo default ul/ol styles
52
+ .media-list {
53
+ margin-left: 0;
54
+ list-style: none;
55
+ }
@@ -178,7 +178,7 @@
178
178
  @mixin input-block-level {
179
179
  display: block;
180
180
  width: 100%;
181
- min-height: 30px; // Make inputs at least the height of their button counterpart
181
+ min-height: $inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
182
182
  @include box-sizing(border-box); // Makes inputs behave like true block-level elements
183
183
  }
184
184
 
@@ -207,7 +207,8 @@
207
207
  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
208
208
  &:focus {
209
209
  border-color: darken($borderColor, 10%);
210
- @include box-shadow((inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%)));
210
+ $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%);
211
+ @include box-shadow($shadow);
211
212
  }
212
213
  }
213
214
  // Give a small background color for input-prepend/-append
@@ -294,7 +295,6 @@
294
295
  }
295
296
 
296
297
  // Transformations
297
-
298
298
  @mixin rotate($degrees) {
299
299
  -webkit-transform: rotate($degrees);
300
300
  -moz-transform: rotate($degrees);
@@ -322,6 +322,7 @@
322
322
  -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
323
323
  -o-transform: skew($x, $y);
324
324
  transform: skew($x, $y);
325
+ -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
325
326
  }
326
327
  @mixin translate3d($x, $y, $z) {
327
328
  -webkit-transform: translate3d($x, $y, $z);
@@ -648,6 +649,11 @@
648
649
  margin-left: 0;
649
650
  }
650
651
 
652
+ // Space grid-sized controls properly if multiple per line
653
+ .controls-row [class*="span"] + [class*="span"] {
654
+ margin-left: $fluidGridGutterWidth;
655
+ }
656
+
651
657
  // generate .spanX and .offsetX
652
658
  @include grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
653
659
  @include grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
@@ -2,16 +2,6 @@
2
2
  // Modals
3
3
  // --------------------------------------------------
4
4
 
5
-
6
- // Recalculate z-index where appropriate,
7
- // but only apply to elements within modal
8
- .modal-open .modal {
9
- .dropdown-menu { z-index: $zindexDropdown + $zindexModal; }
10
- .dropdown.open { *z-index: $zindexDropdown + $zindexModal; }
11
- .popover { z-index: $zindexPopover + $zindexModal; }
12
- .tooltip { z-index: $zindexTooltip + $zindexModal; }
13
- }
14
-
15
5
  // Background
16
6
  .modal-backdrop {
17
7
  position: fixed;
@@ -36,7 +26,6 @@
36
26
  top: 50%;
37
27
  left: 50%;
38
28
  z-index: $zindexModal;
39
- overflow: auto;
40
29
  width: 560px;
41
30
  margin: -250px 0 0 -280px;
42
31
  background-color: $white;
@@ -46,6 +35,9 @@
46
35
  @include border-radius(6px);
47
36
  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
48
37
  @include background-clip(padding-box);
38
+ // Remove focus outline from opened modal
39
+ outline: none;
40
+
49
41
  &.fade {
50
42
  @include transition(#{'opacity .3s linear, top .3s ease-out'});
51
43
  top: -25%;
@@ -95,4 +87,8 @@
95
87
  .btn-group .btn + .btn {
96
88
  margin-left: -1px;
97
89
  }
90
+ // and override it for block buttons as well
91
+ .btn-block + .btn-block {
92
+ margin-left: 0;
93
+ }
98
94
  }
@@ -25,7 +25,7 @@
25
25
  padding-right: 20px;
26
26
  @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
27
27
  border: 1px solid $navbarBorder;
28
- @include border-radius(4px);
28
+ @include border-radius($baseBorderRadius);
29
29
  @include box-shadow(0 1px 4px rgba(0,0,0,.065));
30
30
 
31
31
  // Prevent floats from breaking the navbar
@@ -41,6 +41,7 @@
41
41
  // Override the default collapsed state
42
42
  .nav-collapse.collapse {
43
43
  height: auto;
44
+ overflow: visible;
44
45
  }
45
46
 
46
47
 
@@ -152,7 +153,6 @@
152
153
 
153
154
  .navbar-static-top {
154
155
  position: static;
155
- width: 100%;
156
156
  margin-bottom: 0; // remove 18px margin for default navbar
157
157
  .navbar-inner {
158
158
  @include border-radius(0);
@@ -202,7 +202,7 @@
202
202
  .navbar-fixed-top,
203
203
  .navbar-static-top {
204
204
  .navbar-inner {
205
- @include box-shadow((inset 0 -1px 0 rgba(0,0,0,.1), 0 1px 10px rgba(0,0,0,.1)));
205
+ @include box-shadow((0 1px 10px rgba(0,0,0,.1)));
206
206
  }
207
207
  }
208
208
 
@@ -210,7 +210,7 @@
210
210
  .navbar-fixed-bottom {
211
211
  bottom: 0;
212
212
  .navbar-inner {
213
- @include box-shadow((inset 0 1px 0 rgba(0,0,0,.1), 0 -1px 10px rgba(0,0,0,.1)));
213
+ @include box-shadow((0 -1px 10px rgba(0,0,0,.1)));
214
214
  }
215
215
  }
216
216
 
@@ -67,7 +67,8 @@
67
67
  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
68
68
  background-color: $linkColor;
69
69
  }
70
- .nav-list [class^="icon-"] {
70
+ .nav-list [class^="icon-"],
71
+ .nav-list [class*=" icon-"] {
71
72
  margin-right: 2px;
72
73
  }
73
74
  // Dividers (basically an hr) within the dropdown
@@ -123,7 +124,7 @@
123
124
  .nav-tabs > .active > a,
124
125
  .nav-tabs > .active > a:hover {
125
126
  color: $gray;
126
- background-color: $white;
127
+ background-color: $bodyBackground;
127
128
  border: 1px solid #ddd;
128
129
  border-bottom-color: transparent;
129
130
  cursor: default;
@@ -12,28 +12,29 @@
12
12
  .pager li {
13
13
  display: inline;
14
14
  }
15
- .pager a,
16
- .pager span {
15
+ .pager li > a,
16
+ .pager li > span {
17
17
  display: inline-block;
18
18
  padding: 5px 14px;
19
19
  background-color: #fff;
20
20
  border: 1px solid #ddd;
21
21
  @include border-radius(15px);
22
22
  }
23
- .pager a:hover {
23
+ .pager li > a:hover {
24
24
  text-decoration: none;
25
25
  background-color: #f5f5f5;
26
26
  }
27
- .pager .next a,
28
- .pager .next span {
27
+ .pager .next > a,
28
+ .pager .next > span {
29
29
  float: right;
30
30
  }
31
- .pager .previous a {
31
+ .pager .previous > a,
32
+ .pager .previous > span {
32
33
  float: left;
33
34
  }
34
- .pager .disabled a,
35
- .pager .disabled a:hover,
36
- .pager .disabled span {
35
+ .pager .disabled > a,
36
+ .pager .disabled > a:hover,
37
+ .pager .disabled > span {
37
38
  color: $grayLight;
38
39
  background-color: #fff;
39
40
  cursor: default;
@@ -2,27 +2,30 @@
2
2
  // Pagination (multiple pages)
3
3
  // --------------------------------------------------
4
4
 
5
-
5
+ // Space out pagination from surrounding content
6
6
  .pagination {
7
- height: $baseLineHeight * 2;
8
7
  margin: $baseLineHeight 0;
9
- }
8
+ }
9
+
10
10
  .pagination ul {
11
+ // Allow for text-based alignment
11
12
  display: inline-block;
12
13
  @include ie7-inline-block();
14
+ // Reset default ul styles
13
15
  margin-left: 0;
14
16
  margin-bottom: 0;
15
- @include border-radius(3px);
17
+ // Visuals
18
+ @include border-radius($baseBorderRadius);
16
19
  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
17
20
  }
18
21
  .pagination ul > li {
19
- display: inline;
22
+ display: inline; // Remove list-style and block-level defaults
20
23
  }
21
24
  .pagination ul > li > a,
22
25
  .pagination ul > li > span {
23
- float: left;
24
- padding: 0 14px;
25
- line-height: ($baseLineHeight * 2) - 2;
26
+ float: left; // Collapse white-space
27
+ padding: 4px 12px;
28
+ line-height: $baseLineHeight;
26
29
  text-decoration: none;
27
30
  background-color: $paginationBackground;
28
31
  border: 1px solid $paginationBorder;
@@ -31,7 +34,7 @@
31
34
  .pagination ul > li > a:hover,
32
35
  .pagination ul > .active > a,
33
36
  .pagination ul > .active > span {
34
- background-color: #f5f5f5;
37
+ background-color: $paginationActiveBackground;
35
38
  }
36
39
  .pagination ul > .active > a,
37
40
  .pagination ul > .active > span {
@@ -48,17 +51,71 @@
48
51
  .pagination ul > li:first-child > a,
49
52
  .pagination ul > li:first-child > span {
50
53
  border-left-width: 1px;
51
- @include border-radius(3px 0 0 3px);
54
+ @include border-left-radius($baseBorderRadius);
52
55
  }
53
56
  .pagination ul > li:last-child > a,
54
57
  .pagination ul > li:last-child > span {
55
- @include border-radius(0 3px 3px 0);
58
+ @include border-right-radius($baseBorderRadius);
56
59
  }
57
60
 
58
- // Centered
61
+
62
+ // Alignment
63
+ // --------------------------------------------------
64
+
59
65
  .pagination-centered {
60
66
  text-align: center;
61
67
  }
62
68
  .pagination-right {
63
69
  text-align: right;
64
70
  }
71
+
72
+
73
+ // Sizing
74
+ // --------------------------------------------------
75
+
76
+ // Large
77
+ .pagination-large {
78
+ ul > li > a,
79
+ ul > li > span {
80
+ padding: $paddingLarge;
81
+ font-size: $fontSizeLarge;
82
+ }
83
+ ul > li:first-child > a,
84
+ ul > li:first-child > span {
85
+ @include border-left-radius($borderRadiusLarge);
86
+ }
87
+ ul > li:last-child > a,
88
+ ul > li:last-child > span {
89
+ @include border-right-radius($borderRadiusLarge);
90
+ }
91
+ }
92
+
93
+ // Small and mini
94
+ .pagination-mini,
95
+ .pagination-small {
96
+ ul > li:first-child > a,
97
+ ul > li:first-child > span {
98
+ @include border-left-radius($borderRadiusSmall);
99
+ }
100
+ ul > li:last-child > a,
101
+ ul > li:last-child > span {
102
+ @include border-right-radius($borderRadiusSmall);
103
+ }
104
+ }
105
+
106
+ // Small
107
+ .pagination-small {
108
+ ul > li > a,
109
+ ul > li > span {
110
+ padding: $paddingSmall;
111
+ font-size: $fontSizeSmall;
112
+ }
113
+ }
114
+ // Mini
115
+ .pagination-mini {
116
+ ul > li > a,
117
+ ul > li > span {
118
+ padding: $paddingMini;
119
+ font-size: $fontSizeMini;
120
+ }
121
+ }
@@ -21,10 +21,10 @@
21
21
  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
22
22
 
23
23
  // Offset the popover to account for the popover arrow
24
- &.top { margin-bottom: 10px; }
24
+ &.top { margin-top: -10px; }
25
25
  &.right { margin-left: 10px; }
26
26
  &.bottom { margin-top: 10px; }
27
- &.left { margin-right: 10px; }
27
+ &.left { margin-left: -10px; }
28
28
 
29
29
  }
30
30
 
@@ -48,7 +48,7 @@
48
48
  margin-bottom: $baseLineHeight;
49
49
  @include gradient-vertical(#f5f5f5, #f9f9f9);
50
50
  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
51
- @include border-radius(4px);
51
+ @include border-radius($baseBorderRadius);
52
52
  }
53
53
 
54
54
  // Bar of progress
@@ -88,7 +88,8 @@ img {
88
88
  }
89
89
 
90
90
  // Prevent max-width from affecting Google Maps
91
- #map_canvas img {
91
+ #map_canvas img,
92
+ .google-maps img {
92
93
  max-width: none;
93
94
  }
94
95
 
@@ -115,11 +116,11 @@ input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
115
116
  border: 0;
116
117
  }
117
118
  button,
118
- input[type="button"],
119
+ html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
119
120
  input[type="reset"],
120
121
  input[type="submit"] {
121
- cursor: pointer; // Cursors on all buttons applied consistently
122
- -webkit-appearance: button; // Style clickable inputs in iOS
122
+ -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
123
+ cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
123
124
  }
124
125
  input[type="search"] { // Appearance in Safari/Chrome
125
126
  -webkit-box-sizing: content-box;
@@ -54,6 +54,7 @@
54
54
  }
55
55
  // Make all grid-sized elements block level again
56
56
  [class*="span"],
57
+ .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
57
58
  .row-fluid [class*="span"] {
58
59
  float: none;
59
60
  display: block;
@@ -66,6 +67,9 @@
66
67
  width: 100%;
67
68
  @include box-sizing(border-box);
68
69
  }
70
+ .row-fluid [class*="offset"]:first-child {
71
+ margin-left: 0;
72
+ }
69
73
 
70
74
  // FORM FIELDS
71
75
  // -----------
@@ -99,7 +103,8 @@
99
103
  right: 20px;
100
104
  width: auto;
101
105
  margin: 0;
102
- &.fade.in { top: auto; }
106
+ &.fade { top: -100px; }
107
+ &.fade.in { top: 20px; }
103
108
  }
104
109
 
105
110
  }
@@ -151,6 +156,20 @@
151
156
  }
152
157
  }
153
158
 
159
+ // Medias
160
+ // Reset float and spacing to stack
161
+ .media .pull-left,
162
+ .media .pull-right {
163
+ float: none;
164
+ display: block;
165
+ margin-bottom: 10px;
166
+ }
167
+ // Remove side margins since we stack instead of indent
168
+ .media-object {
169
+ margin-right: 0;
170
+ margin-left: 0;
171
+ }
172
+
154
173
  // Modals
155
174
  .modal {
156
175
  top: 10px;