bootstrap-sass-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 (53) hide show
  1. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
  2. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +200 -199
  3. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  4. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
  5. data/app/assets/javascripts/twitter/bootstrap/affix.js +2 -2
  6. data/app/assets/javascripts/twitter/bootstrap/alert.js +1 -1
  7. data/app/assets/javascripts/twitter/bootstrap/button.js +1 -1
  8. data/app/assets/javascripts/twitter/bootstrap/carousel.js +2 -2
  9. data/app/assets/javascripts/twitter/bootstrap/collapse.js +2 -2
  10. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +2 -2
  11. data/app/assets/javascripts/twitter/bootstrap/modal.js +2 -2
  12. data/app/assets/javascripts/twitter/bootstrap/popover.js +2 -2
  13. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +2 -2
  14. data/app/assets/javascripts/twitter/bootstrap/tab.js +3 -3
  15. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +2 -2
  16. data/app/assets/javascripts/twitter/bootstrap/transition.js +1 -1
  17. data/app/assets/stylesheets/twitter/bootstrap.css.scss +0 -10
  18. data/app/assets/stylesheets/twitter/bootstrap/_alerts.scss +1 -1
  19. data/app/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss +2 -2
  20. data/app/assets/stylesheets/twitter/bootstrap/_button-groups.scss +6 -1
  21. data/app/assets/stylesheets/twitter/bootstrap/_buttons.scss +2 -4
  22. data/app/assets/stylesheets/twitter/bootstrap/_carousel.scss +32 -10
  23. data/app/assets/stylesheets/twitter/bootstrap/_code.scss +5 -8
  24. data/app/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +1 -2
  25. data/app/assets/stylesheets/twitter/bootstrap/_forms.scss +16 -3
  26. data/app/assets/stylesheets/twitter/bootstrap/_glyphicons.scss +16 -11
  27. data/app/assets/stylesheets/twitter/bootstrap/_grid.scss +31 -285
  28. data/app/assets/stylesheets/twitter/bootstrap/_input-groups.scss +9 -0
  29. data/app/assets/stylesheets/twitter/bootstrap/_jumbotron.scss +2 -2
  30. data/app/assets/stylesheets/twitter/bootstrap/_list-group.scss +14 -15
  31. data/app/assets/stylesheets/twitter/bootstrap/_mixins.scss +155 -31
  32. data/app/assets/stylesheets/twitter/bootstrap/_modals.scss +2 -16
  33. data/app/assets/stylesheets/twitter/bootstrap/_navbar.scss +10 -7
  34. data/app/assets/stylesheets/twitter/bootstrap/_navs.scss +53 -20
  35. data/app/assets/stylesheets/twitter/bootstrap/_normalize.scss +16 -6
  36. data/app/assets/stylesheets/twitter/bootstrap/_pagination.scss +2 -0
  37. data/app/assets/stylesheets/twitter/bootstrap/_panels.scss +31 -7
  38. data/app/assets/stylesheets/twitter/bootstrap/_print.scss +6 -1
  39. data/app/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +4 -7
  40. data/app/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +37 -48
  41. data/app/assets/stylesheets/twitter/bootstrap/_scaffolding.scss +1 -12
  42. data/app/assets/stylesheets/twitter/bootstrap/_tables.scss +40 -40
  43. data/app/assets/stylesheets/twitter/bootstrap/_theme.scss +26 -11
  44. data/app/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +6 -6
  45. data/app/assets/stylesheets/twitter/bootstrap/_tooltip.scss +8 -8
  46. data/app/assets/stylesheets/twitter/bootstrap/_type.scss +71 -30
  47. data/app/assets/stylesheets/twitter/bootstrap/_utilities.scss +15 -1
  48. data/app/assets/stylesheets/twitter/bootstrap/_variables.scss +56 -39
  49. data/lib/bootstrap/sass/rails/engine.rb +9 -1
  50. data/lib/bootstrap/sass/rails/version.rb +1 -1
  51. data/test/cases/usage_css_spec.rb +0 -3
  52. metadata +25 -7
  53. checksums.yaml +0 -15
@@ -48,15 +48,25 @@
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
 
54
- // Dividers (basically an hr) within the dropdown
59
+ // Nav dividers (deprecated with v3.0.1)
60
+ //
61
+ // This should have been removed in v3 with the dropping of `.nav-list`, but
62
+ // we missed it. We don't currently support this anywhere, but in the interest
63
+ // of maintaining backward compatibility in case you use it, it's deprecated.
55
64
  .nav-divider {
56
65
  @include nav-divider();
57
66
  }
58
67
 
59
68
  // Prevent IE8 from misplacing imgs
69
+ //
60
70
  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
61
71
  > li > a > img {
62
72
  max-width: none;
@@ -115,7 +125,7 @@
115
125
 
116
126
  // Links rendered as pills
117
127
  > a {
118
- border-radius: 5px;
128
+ border-radius: $nav-pills-border-radius;
119
129
  }
120
130
  + li {
121
131
  margin-left: 2px;
@@ -128,6 +138,11 @@
128
138
  &:focus {
129
139
  color: $nav-pills-active-link-hover-color;
130
140
  background-color: $nav-pills-active-link-hover-bg;
141
+
142
+ .caret {
143
+ border-top-color: $nav-pills-active-link-hover-color;
144
+ border-bottom-color: $nav-pills-active-link-hover-color;
145
+ }
131
146
  }
132
147
  }
133
148
  }
@@ -159,28 +174,54 @@
159
174
  float: none;
160
175
  > a {
161
176
  text-align: center;
177
+ margin-bottom: 5px;
162
178
  }
163
179
  }
164
180
 
165
- @media (min-width: $screen-sm) {
181
+ > .dropdown .dropdown-menu {
182
+ top: auto;
183
+ left: auto;
184
+ }
185
+
186
+ @media (min-width: $screen-sm-min) {
166
187
  > li {
167
188
  display: table-cell;
168
189
  width: 1%;
190
+ > a {
191
+ margin-bottom: 0;
192
+ }
169
193
  }
170
194
  }
171
195
  }
172
196
 
173
197
  // Move borders to anchors instead of bottom of list
198
+ //
199
+ // Mixin for adding on top the shared `.nav-justified` styles for our tabs
174
200
  .nav-tabs-justified {
175
201
  border-bottom: 0;
176
- > li > a {
177
- border-bottom: 1px solid $nav-tabs-justified-link-border-color;
178
202
 
203
+ > li > a {
179
204
  // Override margin from .nav-tabs
180
205
  margin-right: 0;
206
+ border-radius: $border-radius-base;
181
207
  }
182
- > .active > a {
183
- border-bottom-color: $nav-tabs-justified-active-link-border-color;
208
+
209
+ > .active > a,
210
+ > .active > a:hover,
211
+ > .active > a:focus {
212
+ border: 1px solid $nav-tabs-justified-link-border-color;
213
+ }
214
+
215
+ @media (min-width: $screen-sm-min) {
216
+ > li > a {
217
+ border-bottom: 1px solid $nav-tabs-justified-link-border-color;
218
+ border-radius: $border-radius-base $border-radius-base 0 0;
219
+ }
220
+ > .active > a,
221
+ > .active > a:hover,
222
+ > .active > a:focus {
223
+ border-bottom-color: $nav-tabs-justified-active-link-border-color;
224
+ }
184
225
  }
185
226
  }
186
227
 
@@ -188,25 +229,17 @@
188
229
  // Tabbable tabs
189
230
  // -------------------------
190
231
 
191
- // Clear any floats
192
- .tabbable {
193
- @include clearfix();
194
- }
195
-
196
- // Show/hide tabbable areas
197
- .tab-content > .tab-pane,
198
- .pill-content > .pill-pane {
199
- display: none;
200
- }
201
- .tab-content,
202
- .pill-content {
232
+ // Hide tabbable panes to start, show them when `.active`
233
+ .tab-content {
234
+ > .tab-pane {
235
+ display: none;
236
+ }
203
237
  > .active {
204
238
  display: block;
205
239
  }
206
240
  }
207
241
 
208
242
 
209
-
210
243
  // Dropdowns
211
244
  // -------------------------
212
245
 
@@ -1,4 +1,4 @@
1
- /*! normalize.css v2.1.0 | MIT License | git.io/normalize */
1
+ /*! normalize.css v2.1.3 | MIT License | git.io/normalize */
2
2
 
3
3
  // ==========================================================================
4
4
  // HTML5 display definitions
@@ -44,10 +44,12 @@ audio:not([controls]) {
44
44
  }
45
45
 
46
46
  //
47
- // Address styling not present in IE 8/9.
47
+ // Address `[hidden]` styling not present in IE 8/9.
48
+ // Hide the `template` element in IE, Safari, and Firefox < 22.
48
49
  //
49
50
 
50
- [hidden] {
51
+ [hidden],
52
+ template {
51
53
  display: none;
52
54
  }
53
55
 
@@ -63,8 +65,8 @@ audio:not([controls]) {
63
65
 
64
66
  html {
65
67
  font-family: sans-serif; // 1
66
- -webkit-text-size-adjust: 100%; // 2
67
68
  -ms-text-size-adjust: 100%; // 2
69
+ -webkit-text-size-adjust: 100%; // 2
68
70
  }
69
71
 
70
72
  //
@@ -79,6 +81,14 @@ body {
79
81
  // Links
80
82
  // ==========================================================================
81
83
 
84
+ //
85
+ // Remove the gray background color from active links in IE 10.
86
+ //
87
+
88
+ a {
89
+ background: transparent;
90
+ }
91
+
82
92
  //
83
93
  // Address `outline` inconsistency between Chrome and other browsers.
84
94
  //
@@ -329,8 +339,8 @@ html input[disabled] {
329
339
  }
330
340
 
331
341
  //
332
- // 1. Address box sizing set to `content-box` in IE 8/9.
333
- // 2. Remove excess padding in IE 8/9.
342
+ // 1. Address box sizing set to `content-box` in IE 8/9/10.
343
+ // 2. Remove excess padding in IE 8/9/10.
334
344
  //
335
345
 
336
346
  input[type="checkbox"],
@@ -58,6 +58,8 @@
58
58
 
59
59
  > .disabled {
60
60
  > span,
61
+ > span:hover,
62
+ > span:focus,
61
63
  > a,
62
64
  > a:hover,
63
65
  > a:focus {
@@ -56,12 +56,37 @@
56
56
  // watch it go full width.
57
57
 
58
58
  .panel {
59
- > .table {
59
+ > .table,
60
+ > .table-responsive {
60
61
  margin-bottom: 0;
61
62
  }
62
- > .panel-body + .table {
63
+ > .panel-body + .table,
64
+ > .panel-body + .table-responsive {
63
65
  border-top: 1px solid $table-border-color;
64
66
  }
67
+ > .table-bordered,
68
+ > .table-responsive > .table-bordered {
69
+ border: 0;
70
+ > thead,
71
+ > tbody,
72
+ > tfoot {
73
+ > tr {
74
+ > th:first-child,
75
+ > td:first-child {
76
+ border-left: 0;
77
+ }
78
+ > th:last-child,
79
+ > td:last-child {
80
+ border-right: 0;
81
+ }
82
+
83
+ &:last-child > th,
84
+ &:last-child > td {
85
+ border-bottom: 0;
86
+ }
87
+ }
88
+ }
89
+ }
65
90
  }
66
91
 
67
92
 
@@ -70,6 +95,10 @@
70
95
  padding: 10px 15px;
71
96
  border-bottom: 1px solid transparent;
72
97
  @include border-top-radius($panel-border-radius - 1);
98
+
99
+ & > .dropdown .dropdown-toggle {
100
+ color: inherit;
101
+ }
73
102
  }
74
103
 
75
104
  // Within heading, strip any `h*` tag of it's default margins for spacing.
@@ -119,11 +148,6 @@
119
148
  border-bottom: 1px solid $panel-inner-border;
120
149
  }
121
150
  }
122
-
123
- // New subcomponent for wrapping collapsable content for proper animations
124
- .panel-collapse {
125
-
126
- }
127
151
  }
128
152
 
129
153
 
@@ -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;
@@ -6,7 +6,7 @@
6
6
  // Bar animations
7
7
  // -------------------------
8
8
 
9
- // Webkit
9
+ // WebKit
10
10
  @-webkit-keyframes progress-bar-stripes {
11
11
  from { background-position: 40px 0; }
12
12
  to { background-position: 0 0; }
@@ -51,6 +51,7 @@
51
51
  width: 0%;
52
52
  height: 100%;
53
53
  font-size: $font-size-small;
54
+ line-height: $line-height-computed;
54
55
  color: $progress-bar-color;
55
56
  text-align: center;
56
57
  background-color: $progress-bar-bg;
@@ -60,17 +61,13 @@
60
61
 
61
62
  // Striped bars
62
63
  .progress-striped .progress-bar {
63
- @include gradient-striped($progress-bar-bg);
64
+ @include gradient-striped();
64
65
  background-size: 40px 40px;
65
66
  }
66
67
 
67
68
  // Call animation for the active one
68
69
  .progress.active .progress-bar {
69
- -webkit-animation: progress-bar-stripes 2s linear infinite;
70
- -moz-animation: progress-bar-stripes 2s linear infinite;
71
- -ms-animation: progress-bar-stripes 2s linear infinite;
72
- -o-animation: progress-bar-stripes 2s linear infinite;
73
- animation: progress-bar-stripes 2s linear infinite;
70
+ @include animation(progress-bar-stripes 2s linear infinite);
74
71
  }
75
72
 
76
73
 
@@ -3,36 +3,25 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // IE10 Metro responsive
7
- // Required for Windows 8 Metro split-screen snapping with IE10
6
+ // IE10 in Windows (Phone) 8
8
7
  //
9
- // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
10
- @-ms-viewport{
11
- width: device-width;
12
- }
13
-
14
- // IE10 on Windows Phone 8
15
- // IE10 on WP8 doesn't report CSS pixels, but actual device pixels. In
16
- // other words, say on a Lumia, you'll get 768px as the device width,
17
- // meaning users will see the tablet styles and not phone styles.
8
+ // Support for responsive views via media queries is kind of borked in IE10, for
9
+ // Surface/desktop in split view and for Windows Phone 8. This particular fix
10
+ // must be accompanied by a snippet of JavaScript to sniff the user agent and
11
+ // apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at
12
+ // our Getting Started page for more information on this bug.
18
13
  //
19
- // Alternatively you can override this with JS (see source below), but
20
- // we won't be doing that here given our limited scope.
14
+ // For more information, see the following:
21
15
  //
22
- // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
23
- @media screen and (max-width: 400px) {
24
- @-ms-viewport{
25
- width: 320px;
26
- }
27
- }
16
+ // Issue: https://github.com/twbs/bootstrap/issues/10497
17
+ // Docs: http://getbootstrap.com/getting-started/#browsers
18
+ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
28
19
 
29
- // Hide from screenreaders and browsers
30
- // Credit: HTML5 Boilerplate
31
- .hidden {
32
- display: none !important;
33
- visibility: hidden !important;
20
+ @-ms-viewport {
21
+ width: device-width;
34
22
  }
35
23
 
24
+
36
25
  // Visibility utilities
37
26
 
38
27
  @include responsive-invisibility('.visible-xs');
@@ -40,17 +29,17 @@
40
29
  @include responsive-visibility('.visible-xs');
41
30
  }
42
31
 
43
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
32
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
44
33
  @include responsive-visibility('.visible-xs.visible-sm');
45
34
  }
46
35
 
47
36
 
48
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
37
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
49
38
  @include responsive-visibility('.visible-xs.visible-md');
50
39
  }
51
40
 
52
41
 
53
- @media (min-width: $screen-lg) {
42
+ @media (min-width: $screen-lg-min) {
54
43
  @include responsive-visibility('.visible-xs.visible-lg');
55
44
  }
56
45
 
@@ -61,16 +50,16 @@
61
50
  @include responsive-visibility('.visible-sm.visible-xs');
62
51
  }
63
52
 
64
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
53
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
65
54
  @include responsive-visibility('.visible-sm');
66
55
  }
67
56
 
68
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
57
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
69
58
  @include responsive-visibility('.visible-sm.visible-md');
70
59
  }
71
60
 
72
61
 
73
- @media (min-width: $screen-lg) {
62
+ @media (min-width: $screen-lg-min) {
74
63
  @include responsive-visibility('.visible-sm.visible-lg');
75
64
  }
76
65
 
@@ -82,15 +71,15 @@
82
71
  }
83
72
 
84
73
 
85
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
74
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
86
75
  @include responsive-visibility('.visible-md.visible-sm');
87
76
  }
88
77
 
89
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
78
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
90
79
  @include responsive-visibility('.visible-md');
91
80
  }
92
81
 
93
- @media (min-width: $screen-lg) {
82
+ @media (min-width: $screen-lg-min) {
94
83
  @include responsive-visibility('.visible-md.visible-lg');
95
84
  }
96
85
 
@@ -102,16 +91,16 @@
102
91
  }
103
92
 
104
93
 
105
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
94
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
106
95
  @include responsive-visibility('.visible-lg.visible-sm');
107
96
  }
108
97
 
109
98
 
110
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
99
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
111
100
  @include responsive-visibility('.visible-lg.visible-md');
112
101
  }
113
102
 
114
- @media (min-width: $screen-lg) {
103
+ @media (min-width: $screen-lg-min) {
115
104
  @include responsive-visibility('.visible-lg');
116
105
  }
117
106
 
@@ -120,17 +109,17 @@
120
109
  @include responsive-invisibility('.hidden-xs');
121
110
  }
122
111
 
123
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
112
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
124
113
  @include responsive-invisibility('.hidden-xs.hidden-sm');
125
114
  }
126
115
 
127
116
 
128
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
117
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
129
118
  @include responsive-invisibility('.hidden-xs.hidden-md');
130
119
  }
131
120
 
132
121
 
133
- @media (min-width: $screen-lg) {
122
+ @media (min-width: $screen-lg-min) {
134
123
  @include responsive-invisibility('.hidden-xs.hidden-lg');
135
124
  }
136
125
 
@@ -141,16 +130,16 @@
141
130
  @include responsive-invisibility('.hidden-sm.hidden-xs');
142
131
  }
143
132
 
144
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
133
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
145
134
  @include responsive-invisibility('.hidden-sm');
146
135
  }
147
136
 
148
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
137
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
149
138
  @include responsive-invisibility('.hidden-sm.hidden-md');
150
139
  }
151
140
 
152
141
 
153
- @media (min-width: $screen-lg) {
142
+ @media (min-width: $screen-lg-min) {
154
143
  @include responsive-invisibility('.hidden-sm.hidden-lg');
155
144
  }
156
145
 
@@ -162,15 +151,15 @@
162
151
  }
163
152
 
164
153
 
165
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
154
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
166
155
  @include responsive-invisibility('.hidden-md.hidden-sm');
167
156
  }
168
157
 
169
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
158
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
170
159
  @include responsive-invisibility('.hidden-md');
171
160
  }
172
161
 
173
- @media (min-width: $screen-lg) {
162
+ @media (min-width: $screen-lg-min) {
174
163
  @include responsive-invisibility('.hidden-md.hidden-lg');
175
164
  }
176
165
 
@@ -182,16 +171,16 @@
182
171
  }
183
172
 
184
173
 
185
- @media (min-width: $screen-sm) and (max-width: $screen-sm-max) {
174
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
186
175
  @include responsive-invisibility('.hidden-lg.hidden-sm');
187
176
  }
188
177
 
189
178
 
190
- @media (min-width: $screen-md) and (max-width: $screen-md-max) {
179
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
191
180
  @include responsive-invisibility('.hidden-lg.hidden-md');
192
181
  }
193
182
 
194
- @media (min-width: $screen-lg) {
183
+ @media (min-width: $screen-lg-min) {
195
184
  @include responsive-invisibility('.hidden-lg');
196
185
  }
197
186