twitter-bootswatch-rails 3.2.0.0 → 3.3.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (61) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.eot +0 -0
  3. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.svg +272 -213
  4. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  5. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff +0 -0
  6. data/app/assets/fonts/twitter/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  7. data/app/assets/javascripts/twitter/bootstrap/affix.js +44 -24
  8. data/app/assets/javascripts/twitter/bootstrap/alert.js +7 -5
  9. data/app/assets/javascripts/twitter/bootstrap/button.js +17 -11
  10. data/app/assets/javascripts/twitter/bootstrap/carousel.js +31 -17
  11. data/app/assets/javascripts/twitter/bootstrap/collapse.js +70 -29
  12. data/app/assets/javascripts/twitter/bootstrap/dropdown.js +21 -11
  13. data/app/assets/javascripts/twitter/bootstrap/modal.js +68 -24
  14. data/app/assets/javascripts/twitter/bootstrap/popover.js +4 -4
  15. data/app/assets/javascripts/twitter/bootstrap/scrollspy.js +13 -8
  16. data/app/assets/javascripts/twitter/bootstrap/tab.js +42 -17
  17. data/app/assets/javascripts/twitter/bootstrap/tooltip.js +54 -39
  18. data/app/assets/javascripts/twitter/bootstrap/transition.js +2 -2
  19. data/lib/generators/bootswatch/import/import_generator.rb +0 -4
  20. data/lib/generators/bootswatch/install/templates/variables.less.tt +33 -22
  21. data/lib/twitter/bootswatch/rails/version.rb +1 -1
  22. data/vendor/toolkit/twitter/bootstrap/alerts.less +5 -0
  23. data/vendor/toolkit/twitter/bootstrap/badges.less +11 -1
  24. data/vendor/toolkit/twitter/bootstrap/button-groups.less +18 -15
  25. data/vendor/toolkit/twitter/bootstrap/buttons.less +8 -5
  26. data/vendor/toolkit/twitter/bootstrap/carousel.less +26 -0
  27. data/vendor/toolkit/twitter/bootstrap/close.less +1 -0
  28. data/vendor/toolkit/twitter/bootstrap/code.less +1 -0
  29. data/vendor/toolkit/twitter/bootstrap/component-animations.less +5 -2
  30. data/vendor/toolkit/twitter/bootstrap/dropdowns.less +5 -6
  31. data/vendor/toolkit/twitter/bootstrap/forms.less +70 -44
  32. data/vendor/toolkit/twitter/bootstrap/glyphicons.less +69 -1
  33. data/vendor/toolkit/twitter/bootstrap/jumbotron.less +7 -5
  34. data/vendor/toolkit/twitter/bootstrap/list-group.less +1 -8
  35. data/vendor/toolkit/twitter/bootstrap/media.less +35 -30
  36. data/vendor/toolkit/twitter/bootstrap/mixins/buttons.less +2 -0
  37. data/vendor/toolkit/twitter/bootstrap/mixins/forms.less +5 -1
  38. data/vendor/toolkit/twitter/bootstrap/mixins/grid-framework.less +2 -2
  39. data/vendor/toolkit/twitter/bootstrap/mixins/image.less +0 -1
  40. data/vendor/toolkit/twitter/bootstrap/mixins/labels.less +1 -1
  41. data/vendor/toolkit/twitter/bootstrap/mixins/vendor-prefixes.less +6 -3
  42. data/vendor/toolkit/twitter/bootstrap/modals.less +3 -5
  43. data/vendor/toolkit/twitter/bootstrap/navbar.less +31 -25
  44. data/vendor/toolkit/twitter/bootstrap/navs.less +3 -1
  45. data/vendor/toolkit/twitter/bootstrap/normalize.less +5 -3
  46. data/vendor/toolkit/twitter/bootstrap/pager.less +1 -2
  47. data/vendor/toolkit/twitter/bootstrap/pagination.less +1 -1
  48. data/vendor/toolkit/twitter/bootstrap/panels.less +26 -4
  49. data/vendor/toolkit/twitter/bootstrap/popovers.less +6 -4
  50. data/vendor/toolkit/twitter/bootstrap/print.less +102 -96
  51. data/vendor/toolkit/twitter/bootstrap/progress-bars.less +1 -19
  52. data/vendor/toolkit/twitter/bootstrap/responsive-embed.less +2 -1
  53. data/vendor/toolkit/twitter/bootstrap/scaffolding.less +1 -1
  54. data/vendor/toolkit/twitter/bootstrap/tables.less +14 -13
  55. data/vendor/toolkit/twitter/bootstrap/theme.less +26 -11
  56. data/vendor/toolkit/twitter/bootstrap/thumbnails.less +1 -1
  57. data/vendor/toolkit/twitter/bootstrap/tooltip.less +12 -4
  58. data/vendor/toolkit/twitter/bootstrap/type.less +0 -11
  59. data/vendor/toolkit/twitter/bootstrap/utilities.less +0 -1
  60. data/vendor/toolkit/twitter/bootstrap/variables.less +33 -22
  61. metadata +33 -14
@@ -69,7 +69,7 @@
69
69
  color: @pagination-disabled-color;
70
70
  background-color: @pagination-disabled-bg;
71
71
  border-color: @pagination-disabled-border;
72
- cursor: not-allowed;
72
+ cursor: @cursor-disabled;
73
73
  }
74
74
  }
75
75
  }
@@ -36,7 +36,11 @@
36
36
  font-size: ceil((@font-size-base * 1.125));
37
37
  color: inherit;
38
38
 
39
- > a {
39
+ > a,
40
+ > small,
41
+ > .small,
42
+ > small > a,
43
+ > .small > a {
40
44
  color: inherit;
41
45
  }
42
46
  }
@@ -56,7 +60,8 @@
56
60
  // any kind of custom content between the two.
57
61
 
58
62
  .panel {
59
- > .list-group {
63
+ > .list-group,
64
+ > .panel-collapse > .list-group {
60
65
  margin-bottom: 0;
61
66
 
62
67
  .list-group-item {
@@ -100,6 +105,11 @@
100
105
  > .table-responsive > .table,
101
106
  > .panel-collapse > .table {
102
107
  margin-bottom: 0;
108
+
109
+ caption {
110
+ padding-left: @panel-body-padding;
111
+ padding-right: @panel-body-padding;
112
+ }
103
113
  }
104
114
  // Add border top radius for first one
105
115
  > .table:first-child,
@@ -109,6 +119,9 @@
109
119
  > thead:first-child,
110
120
  > tbody:first-child {
111
121
  > tr:first-child {
122
+ border-top-left-radius: (@panel-border-radius - 1);
123
+ border-top-right-radius: (@panel-border-radius - 1);
124
+
112
125
  td:first-child,
113
126
  th:first-child {
114
127
  border-top-left-radius: (@panel-border-radius - 1);
@@ -128,6 +141,9 @@
128
141
  > tbody:last-child,
129
142
  > tfoot:last-child {
130
143
  > tr:last-child {
144
+ border-bottom-left-radius: (@panel-border-radius - 1);
145
+ border-bottom-right-radius: (@panel-border-radius - 1);
146
+
131
147
  td:first-child,
132
148
  th:first-child {
133
149
  border-bottom-left-radius: (@panel-border-radius - 1);
@@ -140,7 +156,9 @@
140
156
  }
141
157
  }
142
158
  > .panel-body + .table,
143
- > .panel-body + .table-responsive {
159
+ > .panel-body + .table-responsive,
160
+ > .table + .panel-body,
161
+ > .table-responsive + .panel-body {
144
162
  border-top: 1px solid @table-border-color;
145
163
  }
146
164
  > .table > tbody:first-child > tr:first-child th,
@@ -202,6 +220,7 @@
202
220
  .panel {
203
221
  margin-bottom: 0;
204
222
  border-radius: @panel-border-radius;
223
+
205
224
  + .panel {
206
225
  margin-top: 5px;
207
226
  }
@@ -209,10 +228,13 @@
209
228
 
210
229
  .panel-heading {
211
230
  border-bottom: 0;
212
- + .panel-collapse > .panel-body {
231
+
232
+ + .panel-collapse > .panel-body,
233
+ + .panel-collapse > .list-group {
213
234
  border-top: 1px solid @panel-inner-border;
214
235
  }
215
236
  }
237
+
216
238
  .panel-footer {
217
239
  border-top: 0;
218
240
  + .panel-collapse .panel-body {
@@ -11,7 +11,12 @@
11
11
  display: none;
12
12
  max-width: @popover-max-width;
13
13
  padding: 1px;
14
- text-align: left; // Reset given new insertion method
14
+ // Reset font and text properties given new insertion method
15
+ font-family: @font-family-base;
16
+ font-size: @font-size-base;
17
+ font-weight: normal;
18
+ line-height: @line-height-base;
19
+ text-align: left;
15
20
  background-color: @popover-bg;
16
21
  background-clip: padding-box;
17
22
  border: 1px solid @popover-fallback-border-color;
@@ -33,8 +38,6 @@
33
38
  margin: 0; // reset heading margin
34
39
  padding: 8px 14px;
35
40
  font-size: @font-size-base;
36
- font-weight: normal;
37
- line-height: 18px;
38
41
  background-color: @popover-title-bg;
39
42
  border-bottom: 1px solid darken(@popover-title-bg, 5%);
40
43
  border-radius: (@border-radius-large - 1) (@border-radius-large - 1) 0 0;
@@ -129,5 +132,4 @@
129
132
  bottom: -@popover-arrow-width;
130
133
  }
131
134
  }
132
-
133
135
  }
@@ -1,101 +1,107 @@
1
- //
2
- // Basic print styles
3
- // --------------------------------------------------
4
- // Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
1
+ /*! Source: https://github.com/h5bp/html5-boilerplate/blob/master/src/css/main.css */
2
+
3
+ // ==========================================================================
4
+ // Print styles.
5
+ // Inlined to avoid the additional HTTP request: h5bp.com/r
6
+ // ==========================================================================
5
7
 
6
8
  @media print {
9
+ *,
10
+ *:before,
11
+ *:after {
12
+ background: transparent !important;
13
+ color: #000 !important; // Black prints faster: h5bp.com/s
14
+ box-shadow: none !important;
15
+ text-shadow: none !important;
16
+ }
17
+
18
+ a,
19
+ a:visited {
20
+ text-decoration: underline;
21
+ }
22
+
23
+ a[href]:after {
24
+ content: " (" attr(href) ")";
25
+ }
26
+
27
+ abbr[title]:after {
28
+ content: " (" attr(title) ")";
29
+ }
30
+
31
+ // Don't show links that are fragment identifiers,
32
+ // or use the `javascript:` pseudo protocol
33
+ a[href^="#"]:after,
34
+ a[href^="javascript:"]:after {
35
+ content: "";
36
+ }
37
+
38
+ pre,
39
+ blockquote {
40
+ border: 1px solid #999;
41
+ page-break-inside: avoid;
42
+ }
43
+
44
+ thead {
45
+ display: table-header-group; // h5bp.com/t
46
+ }
47
+
48
+ tr,
49
+ img {
50
+ page-break-inside: avoid;
51
+ }
7
52
 
8
- * {
9
- text-shadow: none !important;
10
- color: #000 !important; // Black prints faster: h5bp.com/s
11
- background: transparent !important;
12
- box-shadow: none !important;
13
- }
14
-
15
- a,
16
- a:visited {
17
- text-decoration: underline;
18
- }
19
-
20
- a[href]:after {
21
- content: " (" attr(href) ")";
22
- }
23
-
24
- abbr[title]:after {
25
- content: " (" attr(title) ")";
26
- }
27
-
28
- // Don't show links for images, or javascript/internal links
29
- a[href^="javascript:"]:after,
30
- a[href^="#"]:after {
31
- content: "";
32
- }
33
-
34
- pre,
35
- blockquote {
36
- border: 1px solid #999;
37
- page-break-inside: avoid;
38
- }
39
-
40
- thead {
41
- display: table-header-group; // h5bp.com/t
42
- }
43
-
44
- tr,
45
- img {
46
- page-break-inside: avoid;
47
- }
48
-
49
- img {
50
- max-width: 100% !important;
51
- }
52
-
53
- p,
54
- h2,
55
- h3 {
56
- orphans: 3;
57
- widows: 3;
58
- }
59
-
60
- h2,
61
- h3 {
62
- page-break-after: avoid;
63
- }
64
-
65
- // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
66
- // Once fixed, we can just straight up remove this.
67
- select {
68
- background: #fff !important;
69
- }
70
-
71
- // Bootstrap components
72
- .navbar {
73
- display: none;
74
- }
75
- .table {
76
- td,
77
- th {
78
- background-color: #fff !important;
79
- }
80
- }
81
- .btn,
82
- .dropup > .btn {
83
- > .caret {
84
- border-top-color: #000 !important;
85
- }
86
- }
87
- .label {
88
- border: 1px solid #000;
89
- }
90
-
91
- .table {
92
- border-collapse: collapse !important;
93
- }
94
- .table-bordered {
95
- th,
96
- td {
97
- border: 1px solid #ddd !important;
98
- }
99
- }
53
+ img {
54
+ max-width: 100% !important;
55
+ }
56
+
57
+ p,
58
+ h2,
59
+ h3 {
60
+ orphans: 3;
61
+ widows: 3;
62
+ }
63
+
64
+ h2,
65
+ h3 {
66
+ page-break-after: avoid;
67
+ }
68
+
69
+ // Bootstrap specific changes start
70
+ //
71
+ // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
72
+ // Once fixed, we can just straight up remove this.
73
+ select {
74
+ background: #fff !important;
75
+ }
76
+
77
+ // Bootstrap components
78
+ .navbar {
79
+ display: none;
80
+ }
81
+ .btn,
82
+ .dropup > .btn {
83
+ > .caret {
84
+ border-top-color: #000 !important;
85
+ }
86
+ }
87
+ .label {
88
+ border: 1px solid #000;
89
+ }
90
+
91
+ .table {
92
+ border-collapse: collapse !important;
93
+
94
+ td,
95
+ th {
96
+ background-color: #fff !important;
97
+ }
98
+ }
99
+ .table-bordered {
100
+ th,
101
+ td {
102
+ border: 1px solid #ddd !important;
103
+ }
104
+ }
100
105
 
106
+ // Bootstrap specific changes end
101
107
  }
@@ -19,7 +19,6 @@
19
19
  }
20
20
 
21
21
 
22
-
23
22
  // Bar itself
24
23
  // -------------------------
25
24
 
@@ -29,7 +28,7 @@
29
28
  height: @line-height-computed;
30
29
  margin-bottom: @line-height-computed;
31
30
  background-color: @progress-bg;
32
- border-radius: @border-radius-base;
31
+ border-radius: @progress-border-radius;
33
32
  .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
34
33
  }
35
34
 
@@ -67,23 +66,6 @@
67
66
  .animation(progress-bar-stripes 2s linear infinite);
68
67
  }
69
68
 
70
- // Account for lower percentages
71
- .progress-bar {
72
- &[aria-valuenow="1"],
73
- &[aria-valuenow="2"] {
74
- min-width: 30px;
75
- }
76
-
77
- &[aria-valuenow="0"] {
78
- color: @gray-light;
79
- min-width: 30px;
80
- background-color: transparent;
81
- background-image: none;
82
- box-shadow: none;
83
- }
84
- }
85
-
86
-
87
69
 
88
70
  // Variations
89
71
  // -------------------------
@@ -12,7 +12,8 @@
12
12
  .embed-responsive-item,
13
13
  iframe,
14
14
  embed,
15
- object {
15
+ object,
16
+ video {
16
17
  position: absolute;
17
18
  top: 0;
18
19
  left: 0;
@@ -52,7 +52,7 @@ a {
52
52
  &:hover,
53
53
  &:focus {
54
54
  color: @link-hover-color;
55
- text-decoration: underline;
55
+ text-decoration: @link-hover-decoration;
56
56
  }
57
57
 
58
58
  &:focus {
@@ -6,6 +6,12 @@
6
6
  table {
7
7
  background-color: @table-bg;
8
8
  }
9
+ caption {
10
+ padding-top: @table-cell-padding;
11
+ padding-bottom: @table-cell-padding;
12
+ color: @text-muted;
13
+ text-align: left;
14
+ }
9
15
  th {
10
16
  text-align: left;
11
17
  }
@@ -105,11 +111,8 @@ th {
105
111
  // Default zebra-stripe styles (alternating gray and transparent backgrounds)
106
112
 
107
113
  .table-striped {
108
- > tbody > tr:nth-child(odd) {
109
- > td,
110
- > th {
111
- background-color: @table-bg-accent;
112
- }
114
+ > tbody > tr:nth-of-type(odd) {
115
+ background-color: @table-bg-accent;
113
116
  }
114
117
  }
115
118
 
@@ -120,10 +123,7 @@ th {
120
123
 
121
124
  .table-hover {
122
125
  > tbody > tr:hover {
123
- > td,
124
- > th {
125
- background-color: @table-bg-hover;
126
- }
126
+ background-color: @table-bg-hover;
127
127
  }
128
128
  }
129
129
 
@@ -133,7 +133,7 @@ th {
133
133
  // Reset default table behavior
134
134
 
135
135
  table col[class*="col-"] {
136
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
136
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
137
137
  float: none;
138
138
  display: table-column;
139
139
  }
@@ -141,7 +141,7 @@ table {
141
141
  td,
142
142
  th {
143
143
  &[class*="col-"] {
144
- position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
144
+ position: static; // Prevent border hiding in Firefox and IE9-11 (see https://github.com/twbs/bootstrap/issues/11623)
145
145
  float: none;
146
146
  display: table-cell;
147
147
  }
@@ -169,14 +169,15 @@ table {
169
169
  // will display normally.
170
170
 
171
171
  .table-responsive {
172
+ overflow-x: auto;
173
+ min-height: 0.01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
174
+
172
175
  @media screen and (max-width: @screen-xs-max) {
173
176
  width: 100%;
174
177
  margin-bottom: (@line-height-computed * 0.75);
175
178
  overflow-y: hidden;
176
- overflow-x: auto;
177
179
  -ms-overflow-style: -ms-autohiding-scrollbar;
178
180
  border: 1px solid @table-border-color;
179
- -webkit-overflow-scrolling: touch;
180
181
 
181
182
  // Tighten up spacing
182
183
  > .table {