bootstrap-on-rails 0.0.1 → 0.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (62) hide show
  1. checksums.yaml +7 -0
  2. data/README.md +28 -1
  3. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  4. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.svg +200 -199
  5. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  6. data/app/assets/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  7. data/app/assets/javascripts/bootstrap/affix.js +4 -4
  8. data/app/assets/javascripts/bootstrap/alert.js +3 -3
  9. data/app/assets/javascripts/bootstrap/button.js +3 -3
  10. data/app/assets/javascripts/bootstrap/carousel.js +4 -4
  11. data/app/assets/javascripts/bootstrap/collapse.js +4 -4
  12. data/app/assets/javascripts/bootstrap/dropdown.js +4 -4
  13. data/app/assets/javascripts/bootstrap/modal.js +4 -4
  14. data/app/assets/javascripts/bootstrap/popover.js +4 -4
  15. data/app/assets/javascripts/bootstrap/scrollspy.js +4 -4
  16. data/app/assets/javascripts/bootstrap/tab.js +5 -5
  17. data/app/assets/javascripts/bootstrap/tooltip.js +4 -4
  18. data/app/assets/javascripts/bootstrap/transition.js +3 -3
  19. data/app/assets/stylesheets/bootstrap/alerts.less +1 -1
  20. data/app/assets/stylesheets/bootstrap/badges.less +0 -0
  21. data/app/assets/stylesheets/bootstrap/bootstrap.less +0 -10
  22. data/app/assets/stylesheets/bootstrap/breadcrumbs.less +2 -2
  23. data/app/assets/stylesheets/bootstrap/button-groups.less +6 -1
  24. data/app/assets/stylesheets/bootstrap/buttons.less +2 -4
  25. data/app/assets/stylesheets/bootstrap/carousel.less +32 -10
  26. data/app/assets/stylesheets/bootstrap/close.less +0 -0
  27. data/app/assets/stylesheets/bootstrap/code.less +5 -8
  28. data/app/assets/stylesheets/bootstrap/component-animations.less +0 -0
  29. data/app/assets/stylesheets/bootstrap/dropdowns.less +1 -2
  30. data/app/assets/stylesheets/bootstrap/forms.less +12 -10
  31. data/app/assets/stylesheets/bootstrap/glyphicons.less +13 -12
  32. data/app/assets/stylesheets/bootstrap/grid.less +32 -285
  33. data/app/assets/stylesheets/bootstrap/input-groups.less +9 -0
  34. data/app/assets/stylesheets/bootstrap/jumbotron.less +2 -2
  35. data/app/assets/stylesheets/bootstrap/labels.less +0 -0
  36. data/app/assets/stylesheets/bootstrap/list-group.less +12 -12
  37. data/app/assets/stylesheets/bootstrap/media.less +0 -0
  38. data/app/assets/stylesheets/bootstrap/mixins.less +131 -17
  39. data/app/assets/stylesheets/bootstrap/modals.less +2 -11
  40. data/app/assets/stylesheets/bootstrap/navbar.less +10 -7
  41. data/app/assets/stylesheets/bootstrap/navs.less +52 -19
  42. data/app/assets/stylesheets/bootstrap/normalize.less +16 -6
  43. data/app/assets/stylesheets/bootstrap/pager.less +0 -0
  44. data/app/assets/stylesheets/bootstrap/pagination.less +0 -0
  45. data/app/assets/stylesheets/bootstrap/panels.less +31 -7
  46. data/app/assets/stylesheets/bootstrap/popovers.less +0 -0
  47. data/app/assets/stylesheets/bootstrap/print.less +6 -1
  48. data/app/assets/stylesheets/bootstrap/progress-bars.less +4 -7
  49. data/app/assets/stylesheets/bootstrap/responsive-utilities.less +13 -24
  50. data/app/assets/stylesheets/bootstrap/scaffolding.less +1 -12
  51. data/app/assets/stylesheets/bootstrap/tables.less +37 -39
  52. data/app/assets/stylesheets/bootstrap/theme.less +17 -11
  53. data/app/assets/stylesheets/bootstrap/thumbnails.less +14 -15
  54. data/app/assets/stylesheets/bootstrap/tooltip.less +8 -8
  55. data/app/assets/stylesheets/bootstrap/type.less +58 -21
  56. data/app/assets/stylesheets/bootstrap/utilities.less +14 -0
  57. data/app/assets/stylesheets/bootstrap/variables.less +36 -34
  58. data/app/assets/stylesheets/bootstrap/wells.less +0 -0
  59. data/bootstrap-on-rails.gemspec +2 -0
  60. data/lib/bootstrap-on-rails.rb +1 -0
  61. data/lib/bootstrap-on-rails/version.rb +1 -1
  62. metadata +24 -11
@@ -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
  .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
 
181
+ > .dropdown .dropdown-menu {
182
+ top: auto;
183
+ left: auto;
184
+ }
185
+
165
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;
207
+ }
208
+
209
+ > .active > a,
210
+ > .active > a:hover,
211
+ > .active > a:focus {
212
+ border: 1px solid @nav-tabs-justified-link-border-color;
181
213
  }
182
- > .active > a {
183
- border-bottom-color: @nav-tabs-justified-active-link-border-color;
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
- .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"],
@@ -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
  .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
- #gradient > .striped(@progress-bar-bg);
64
+ #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
+ .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
  .visible-xs {
@@ -37,17 +37,6 @@ textarea {
37
37
  line-height: inherit;
38
38
  }
39
39
 
40
- // Reset unusual Firefox-on-Android default style.
41
- //
42
- // See https://github.com/necolas/normalize.css/issues/214
43
-
44
- button,
45
- input,
46
- select[multiple],
47
- textarea {
48
- background-image: none;
49
- }
50
-
51
40
 
52
41
  // Links
53
42
 
@@ -125,6 +114,6 @@ hr {
125
114
  margin: -1px;
126
115
  padding: 0;
127
116
  overflow: hidden;
128
- clip: rect(0 0 0 0);
117
+ clip: rect(0,0,0,0);
129
118
  border: 0;
130
119
  }
@@ -18,9 +18,9 @@ th {
18
18
  width: 100%;
19
19
  margin-bottom: @line-height-computed;
20
20
  // Cells
21
- thead,
22
- tbody,
23
- tfoot {
21
+ > thead,
22
+ > tbody,
23
+ > tfoot {
24
24
  > tr {
25
25
  > th,
26
26
  > td {
@@ -32,22 +32,23 @@ th {
32
32
  }
33
33
  }
34
34
  // Bottom align for column headings
35
- thead > tr > th {
35
+ > thead > tr > th {
36
36
  vertical-align: bottom;
37
37
  border-bottom: 2px solid @table-border-color;
38
38
  }
39
39
  // Remove top border from thead by default
40
- caption + thead,
41
- colgroup + thead,
42
- thead:first-child {
43
- tr:first-child {
44
- th, td {
40
+ > caption + thead,
41
+ > colgroup + thead,
42
+ > thead:first-child {
43
+ > tr:first-child {
44
+ > th,
45
+ > td {
45
46
  border-top: 0;
46
47
  }
47
48
  }
48
49
  }
49
50
  // Account for multiple tbody instances
50
- tbody + tbody {
51
+ > tbody + tbody {
51
52
  border-top: 2px solid @table-border-color;
52
53
  }
53
54
 
@@ -61,9 +62,9 @@ th {
61
62
  // Condensed table w/ half padding
62
63
 
63
64
  .table-condensed {
64
- thead,
65
- tbody,
66
- tfoot {
65
+ > thead,
66
+ > tbody,
67
+ > tfoot {
67
68
  > tr {
68
69
  > th,
69
70
  > td {
@@ -90,12 +91,10 @@ th {
90
91
  }
91
92
  }
92
93
  }
93
- > thead {
94
- > tr {
95
- > th,
96
- > td {
97
- border-bottom-width: 2px;
98
- }
94
+ > thead > tr {
95
+ > th,
96
+ > td {
97
+ border-bottom-width: 2px;
99
98
  }
100
99
  }
101
100
  }
@@ -105,14 +104,10 @@ th {
105
104
  //
106
105
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
107
106
 
108
- .table-striped {
109
- > tbody {
110
- > tr:nth-child(odd) {
111
- > td,
112
- > th {
113
- background-color: @table-bg-accent;
114
- }
115
- }
107
+ .table-striped > tbody > tr:nth-child(odd) {
108
+ > td,
109
+ > th {
110
+ background-color: @table-bg-accent;
116
111
  }
117
112
  }
118
113
 
@@ -121,14 +116,10 @@ th {
121
116
  //
122
117
  // Placed here since it has to come after the potential zebra striping
123
118
 
124
- .table-hover {
125
- > tbody {
126
- > tr:hover {
127
- > td,
128
- > th {
129
- background-color: @table-bg-hover;
130
- }
131
- }
119
+ .table-hover > tbody > tr:hover {
120
+ > td,
121
+ > th {
122
+ background-color: @table-bg-hover;
132
123
  }
133
124
  }
134
125
 
@@ -180,20 +171,19 @@ table {
180
171
  // by enabling horizontal scrolling. Only applies <768px. Everything above that
181
172
  // will display normally.
182
173
 
183
- @media (max-width: @screen-sm-min) {
174
+ @media (max-width: @screen-xs-max) {
184
175
  .table-responsive {
185
176
  width: 100%;
186
- margin-bottom: 15px;
177
+ margin-bottom: (@line-height-computed * 0.75);
187
178
  overflow-y: hidden;
188
179
  overflow-x: scroll;
189
180
  -ms-overflow-style: -ms-autohiding-scrollbar;
190
181
  border: 1px solid @table-border-color;
191
182
  -webkit-overflow-scrolling: touch;
192
183
 
193
- // Tighten up spacing and give a background color
184
+ // Tighten up spacing
194
185
  > .table {
195
186
  margin-bottom: 0;
196
- background-color: #fff;
197
187
 
198
188
  // Ensure the content doesn't wrap
199
189
  > thead,
@@ -226,6 +216,13 @@ table {
226
216
  border-right: 0;
227
217
  }
228
218
  }
219
+ }
220
+
221
+ // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
222
+ // chances are there will be only one `tr` in a `thead` and that would
223
+ // remove the border altogether.
224
+ > tbody,
225
+ > tfoot {
229
226
  > tr:last-child {
230
227
  > th,
231
228
  > td {
@@ -233,6 +230,7 @@ table {
233
230
  }
234
231
  }
235
232
  }
233
+
236
234
  }
237
235
  }
238
236
  }