locomotivecms_wagon 2.0.0.rc2 → 2.0.0.rc3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (159) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +1 -1
  3. data/generators/{bootstrap3 → bootstrap}/Gemfile.tt +0 -0
  4. data/generators/{bootstrap3 → bootstrap}/app/content_types/.empty_directory +0 -0
  5. data/generators/bootstrap/app/views/pages/404.liquid +18 -0
  6. data/generators/bootstrap/app/views/pages/404.liquid.haml +14 -0
  7. data/generators/bootstrap/app/views/pages/index.liquid +31 -0
  8. data/generators/bootstrap/app/views/pages/index.liquid.haml +25 -0
  9. data/generators/bootstrap/app/views/pages/layouts/default.liquid +31 -0
  10. data/generators/bootstrap/app/views/pages/layouts/default.liquid.haml +30 -0
  11. data/generators/bootstrap/app/views/pages/layouts/simple.liquid +36 -0
  12. data/generators/bootstrap/app/views/pages/layouts/simple.liquid.haml +29 -0
  13. data/generators/bootstrap/app/views/snippets/footer.liquid +5 -0
  14. data/generators/bootstrap/app/views/snippets/footer.liquid.haml +3 -0
  15. data/generators/bootstrap/app/views/snippets/nav.liquid +26 -0
  16. data/generators/bootstrap/app/views/snippets/nav.liquid.haml +19 -0
  17. data/generators/{bootstrap3 → bootstrap}/config/deploy.yml +0 -0
  18. data/generators/bootstrap/config/site.yml.tt +1 -6
  19. data/generators/{bootstrap3 → bootstrap}/config/translations.yml +0 -0
  20. data/generators/{bootstrap3 → bootstrap}/data/.empty_directory +0 -0
  21. data/generators/{bootstrap3 → bootstrap}/icon.png +0 -0
  22. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.eot +0 -0
  23. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.svg +288 -0
  24. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.ttf +0 -0
  25. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff +0 -0
  26. data/generators/bootstrap/public/fonts/bootstrap/glyphicons-halflings-regular.woff2 +0 -0
  27. data/generators/{bootstrap3/public/samples → bootstrap/public/images}/favicon.png +0 -0
  28. data/generators/bootstrap/public/javascripts/application.js +2 -0
  29. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/affix.js +60 -35
  30. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/alert.js +15 -9
  31. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/button.js +33 -20
  32. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/carousel.js +79 -47
  33. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/collapse.js +84 -43
  34. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/dropdown.js +64 -46
  35. data/generators/bootstrap/public/javascripts/bootstrap/modal.js +337 -0
  36. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/popover.js +12 -14
  37. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/scrollspy.js +57 -38
  38. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/tab.js +54 -24
  39. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/tooltip.js +202 -87
  40. data/generators/{bootstrap3 → bootstrap}/public/javascripts/bootstrap/transition.js +19 -8
  41. data/generators/bootstrap/public/javascripts/bootstrap.min.js +7 -0
  42. data/generators/bootstrap/public/javascripts/jquery.min.js +5 -0
  43. data/generators/bootstrap/public/stylesheets/application.css +7 -0
  44. data/generators/bootstrap/public/stylesheets/application.scss +7 -0
  45. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_alerts.scss +9 -3
  46. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_badges.scss +26 -13
  47. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_breadcrumbs.scss +3 -1
  48. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_button-groups.scss +32 -14
  49. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_buttons.scss +22 -13
  50. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_carousel.scss +43 -6
  51. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_close.scss +1 -0
  52. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_code.scss +7 -1
  53. data/generators/bootstrap/public/stylesheets/bootstrap/_component-animations.scss +37 -0
  54. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_dropdowns.scss +12 -9
  55. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_forms.scss +240 -65
  56. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_glyphicons.scss +83 -9
  57. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_grid.scss +4 -4
  58. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_input-groups.scss +7 -2
  59. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_jumbotron.scss +12 -4
  60. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_labels.scss +11 -9
  61. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_list-group.scss +32 -12
  62. data/generators/bootstrap/public/stylesheets/bootstrap/_media.scss +66 -0
  63. data/generators/bootstrap/public/stylesheets/bootstrap/_mixins.scss +40 -0
  64. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_modals.scss +18 -7
  65. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_navbar.scss +75 -33
  66. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_navs.scss +4 -4
  67. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_normalize.scss +29 -28
  68. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_pager.scss +2 -3
  69. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_pagination.scss +4 -3
  70. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_panels.scss +40 -10
  71. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_popovers.scss +6 -8
  72. data/generators/bootstrap/public/stylesheets/bootstrap/_print.scss +101 -0
  73. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_progress-bars.scss +13 -6
  74. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-embed.scss +35 -0
  75. data/generators/bootstrap/public/stylesheets/bootstrap/_responsive-utilities.scss +179 -0
  76. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_scaffolding.scss +31 -4
  77. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_tables.scss +17 -16
  78. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_theme.scss +57 -13
  79. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_thumbnails.scss +2 -2
  80. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_tooltip.scss +13 -7
  81. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_type.scss +38 -24
  82. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_utilities.scss +3 -4
  83. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_variables.scss +86 -47
  84. data/generators/{bootstrap3 → bootstrap}/public/stylesheets/bootstrap/_wells.scss +0 -0
  85. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_alerts.scss +14 -0
  86. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_background-variant.scss +12 -0
  87. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_border-radius.scss +18 -0
  88. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_buttons.scss +68 -0
  89. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_center-block.scss +7 -0
  90. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_clearfix.scss +22 -0
  91. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_forms.scss +88 -0
  92. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_gradients.scss +58 -0
  93. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid-framework.scss +81 -0
  94. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_grid.scss +122 -0
  95. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_hide-text.scss +21 -0
  96. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_image.scss +33 -0
  97. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_labels.scss +12 -0
  98. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_list-group.scss +32 -0
  99. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-divider.scss +10 -0
  100. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_nav-vertical-align.scss +9 -0
  101. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_opacity.scss +8 -0
  102. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_pagination.scss +24 -0
  103. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_panels.scss +24 -0
  104. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_progress-bar.scss +10 -0
  105. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-filter.scss +8 -0
  106. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_reset-text.scss +18 -0
  107. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_resize.scss +6 -0
  108. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_responsive-visibility.scss +21 -0
  109. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_size.scss +10 -0
  110. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_tab-focus.scss +9 -0
  111. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_table-row.scss +28 -0
  112. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-emphasis.scss +12 -0
  113. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_text-overflow.scss +8 -0
  114. data/generators/bootstrap/public/stylesheets/bootstrap/mixins/_vendor-prefixes.scss +222 -0
  115. data/generators/bootstrap/public/stylesheets/bootstrap.css +5 -0
  116. data/generators/{bootstrap3/public/stylesheets/bootstrap.css.scss → bootstrap/public/stylesheets/bootstrap.scss} +16 -2
  117. data/lib/locomotive/wagon/cli.rb +3 -3
  118. data/lib/locomotive/wagon/commands/authenticate_command.rb +2 -1
  119. data/lib/locomotive/wagon/commands/concerns/spinner_concern.rb +29 -0
  120. data/lib/locomotive/wagon/commands/pull_command.rb +18 -3
  121. data/lib/locomotive/wagon/commands/push_command.rb +28 -4
  122. data/lib/locomotive/wagon/commands/sync_command.rb +21 -6
  123. data/lib/locomotive/wagon/commands/sync_sub_commands/sync_pages_command.rb +27 -3
  124. data/lib/locomotive/wagon/generators/site/{bootstrap3.rb → bootstrap.rb} +12 -6
  125. data/lib/locomotive/wagon/generators/site.rb +1 -1
  126. data/lib/locomotive/wagon/tools/listen.rb +1 -1
  127. data/lib/locomotive/wagon/version.rb +1 -1
  128. data/lib/locomotive/wagon.rb +2 -2
  129. data/locomotivecms_wagon.gemspec +3 -2
  130. data/spec/unit/decorators/theme_asset_decorator_spec.rb +10 -0
  131. metadata +124 -90
  132. data/generators/bootstrap3/app/views/pages/404.liquid +0 -13
  133. data/generators/bootstrap3/app/views/pages/404.liquid.haml +0 -10
  134. data/generators/bootstrap3/app/views/pages/index.liquid +0 -738
  135. data/generators/bootstrap3/app/views/pages/index.liquid.haml +0 -1018
  136. data/generators/bootstrap3/app/views/snippets/footer.liquid +0 -3
  137. data/generators/bootstrap3/app/views/snippets/footer.liquid.haml +0 -2
  138. data/generators/bootstrap3/config/site.yml.tt +0 -28
  139. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.eot +0 -0
  140. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.svg +0 -229
  141. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.ttf +0 -0
  142. data/generators/bootstrap3/public/fonts/glyphicons-halflings-regular.woff +0 -0
  143. data/generators/bootstrap3/public/images/.empty_directory +0 -1
  144. data/generators/bootstrap3/public/javascripts/bootstrap/modal.js +0 -243
  145. data/generators/bootstrap3/public/javascripts/bootstrap.min.js +0 -12
  146. data/generators/bootstrap3/public/samples/apple-touch-icon-114x114-precomposed.png +0 -0
  147. data/generators/bootstrap3/public/samples/apple-touch-icon-144x144-precomposed.png +0 -0
  148. data/generators/bootstrap3/public/samples/apple-touch-icon-72x72-precomposed.png +0 -0
  149. data/generators/bootstrap3/public/samples/apple-touch-icon-precomposed.png +0 -0
  150. data/generators/bootstrap3/public/stylesheets/application.css +0 -1
  151. data/generators/bootstrap3/public/stylesheets/application.css.scss +0 -8
  152. data/generators/bootstrap3/public/stylesheets/bootstrap/_component-animations.scss +0 -29
  153. data/generators/bootstrap3/public/stylesheets/bootstrap/_media.scss +0 -56
  154. data/generators/bootstrap3/public/stylesheets/bootstrap/_mixins.scss +0 -947
  155. data/generators/bootstrap3/public/stylesheets/bootstrap/_print.scss +0 -101
  156. data/generators/bootstrap3/public/stylesheets/bootstrap/_responsive-utilities.scss +0 -74
  157. data/generators/bootstrap3/public/stylesheets/bootstrap/bootstrap.css.scss +0 -49
  158. data/generators/bootstrap3/public/stylesheets/bootstrap.css +0 -5784
  159. data/lib/locomotive/wagon/generators/site/bootstrap2.rb +0 -34
@@ -0,0 +1,179 @@
1
+ //
2
+ // Responsive: Utility classes
3
+ // --------------------------------------------------
4
+
5
+
6
+ // IE10 in Windows (Phone) 8
7
+ //
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.
13
+ //
14
+ // For more information, see the following:
15
+ //
16
+ // Issue: https://github.com/twbs/bootstrap/issues/10497
17
+ // Docs: http://getbootstrap.com/getting-started/#support-ie10-width
18
+ // Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
19
+ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
20
+
21
+ @at-root {
22
+ @-ms-viewport {
23
+ width: device-width;
24
+ }
25
+ }
26
+
27
+
28
+ // Visibility utilities
29
+ // Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
30
+
31
+ @include responsive-invisibility('.visible-xs');
32
+ @include responsive-invisibility('.visible-sm');
33
+ @include responsive-invisibility('.visible-md');
34
+ @include responsive-invisibility('.visible-lg');
35
+
36
+ .visible-xs-block,
37
+ .visible-xs-inline,
38
+ .visible-xs-inline-block,
39
+ .visible-sm-block,
40
+ .visible-sm-inline,
41
+ .visible-sm-inline-block,
42
+ .visible-md-block,
43
+ .visible-md-inline,
44
+ .visible-md-inline-block,
45
+ .visible-lg-block,
46
+ .visible-lg-inline,
47
+ .visible-lg-inline-block {
48
+ display: none !important;
49
+ }
50
+
51
+ @media (max-width: $screen-xs-max) {
52
+ @include responsive-visibility('.visible-xs');
53
+ }
54
+ .visible-xs-block {
55
+ @media (max-width: $screen-xs-max) {
56
+ display: block !important;
57
+ }
58
+ }
59
+ .visible-xs-inline {
60
+ @media (max-width: $screen-xs-max) {
61
+ display: inline !important;
62
+ }
63
+ }
64
+ .visible-xs-inline-block {
65
+ @media (max-width: $screen-xs-max) {
66
+ display: inline-block !important;
67
+ }
68
+ }
69
+
70
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
71
+ @include responsive-visibility('.visible-sm');
72
+ }
73
+ .visible-sm-block {
74
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
75
+ display: block !important;
76
+ }
77
+ }
78
+ .visible-sm-inline {
79
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
80
+ display: inline !important;
81
+ }
82
+ }
83
+ .visible-sm-inline-block {
84
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
85
+ display: inline-block !important;
86
+ }
87
+ }
88
+
89
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
90
+ @include responsive-visibility('.visible-md');
91
+ }
92
+ .visible-md-block {
93
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
94
+ display: block !important;
95
+ }
96
+ }
97
+ .visible-md-inline {
98
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
99
+ display: inline !important;
100
+ }
101
+ }
102
+ .visible-md-inline-block {
103
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
104
+ display: inline-block !important;
105
+ }
106
+ }
107
+
108
+ @media (min-width: $screen-lg-min) {
109
+ @include responsive-visibility('.visible-lg');
110
+ }
111
+ .visible-lg-block {
112
+ @media (min-width: $screen-lg-min) {
113
+ display: block !important;
114
+ }
115
+ }
116
+ .visible-lg-inline {
117
+ @media (min-width: $screen-lg-min) {
118
+ display: inline !important;
119
+ }
120
+ }
121
+ .visible-lg-inline-block {
122
+ @media (min-width: $screen-lg-min) {
123
+ display: inline-block !important;
124
+ }
125
+ }
126
+
127
+ @media (max-width: $screen-xs-max) {
128
+ @include responsive-invisibility('.hidden-xs');
129
+ }
130
+
131
+ @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
132
+ @include responsive-invisibility('.hidden-sm');
133
+ }
134
+
135
+ @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
136
+ @include responsive-invisibility('.hidden-md');
137
+ }
138
+
139
+ @media (min-width: $screen-lg-min) {
140
+ @include responsive-invisibility('.hidden-lg');
141
+ }
142
+
143
+
144
+ // Print utilities
145
+ //
146
+ // Media queries are placed on the inside to be mixin-friendly.
147
+
148
+ // Note: Deprecated .visible-print as of v3.2.0
149
+
150
+ @include responsive-invisibility('.visible-print');
151
+
152
+ @media print {
153
+ @include responsive-visibility('.visible-print');
154
+ }
155
+ .visible-print-block {
156
+ display: none !important;
157
+
158
+ @media print {
159
+ display: block !important;
160
+ }
161
+ }
162
+ .visible-print-inline {
163
+ display: none !important;
164
+
165
+ @media print {
166
+ display: inline !important;
167
+ }
168
+ }
169
+ .visible-print-inline-block {
170
+ display: none !important;
171
+
172
+ @media print {
173
+ display: inline-block !important;
174
+ }
175
+ }
176
+
177
+ @media print {
178
+ @include responsive-invisibility('.hidden-print');
179
+ }
@@ -20,7 +20,7 @@
20
20
  // Body reset
21
21
 
22
22
  html {
23
- font-size: 62.5%;
23
+ font-size: 10px;
24
24
  -webkit-tap-highlight-color: rgba(0,0,0,0);
25
25
  }
26
26
 
@@ -52,11 +52,11 @@ 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 {
59
- @include tab-focus();
59
+ @include tab-focus;
60
60
  }
61
61
  }
62
62
 
@@ -79,7 +79,7 @@ img {
79
79
 
80
80
  // Responsive images (ensure images don't scale beyond their parents)
81
81
  .img-responsive {
82
- @include img-responsive();
82
+ @include img-responsive;
83
83
  }
84
84
 
85
85
  // Rounded corners
@@ -132,3 +132,30 @@ hr {
132
132
  clip: rect(0,0,0,0);
133
133
  border: 0;
134
134
  }
135
+
136
+ // Use in conjunction with .sr-only to only display content when it's focused.
137
+ // Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
138
+ // Credit: HTML5 Boilerplate
139
+
140
+ .sr-only-focusable {
141
+ &:active,
142
+ &:focus {
143
+ position: static;
144
+ width: auto;
145
+ height: auto;
146
+ margin: 0;
147
+ overflow: visible;
148
+ clip: auto;
149
+ }
150
+ }
151
+
152
+
153
+ // iOS "clickable elements" fix for role="button"
154
+ //
155
+ // Fixes "clickability" issue (and more generally, the firing of events such as focus as well)
156
+ // for traditionally non-focusable elements with role="button"
157
+ // see https://developer.mozilla.org/en-US/docs/Web/Events/click#Safari_Mobile
158
+
159
+ [role="button"] {
160
+ cursor: pointer;
161
+ }
@@ -4,9 +4,14 @@
4
4
 
5
5
 
6
6
  table {
7
- max-width: 100%;
8
7
  background-color: $table-bg;
9
8
  }
9
+ caption {
10
+ padding-top: $table-cell-padding;
11
+ padding-bottom: $table-cell-padding;
12
+ color: $text-muted;
13
+ text-align: left;
14
+ }
10
15
  th {
11
16
  text-align: left;
12
17
  }
@@ -16,6 +21,7 @@ th {
16
21
 
17
22
  .table {
18
23
  width: 100%;
24
+ max-width: 100%;
19
25
  margin-bottom: $line-height-computed;
20
26
  // Cells
21
27
  > thead,
@@ -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
  }
@@ -168,15 +168,16 @@ table {
168
168
  // by enabling horizontal scrolling. Only applies <768px. Everything above that
169
169
  // will display normally.
170
170
 
171
- @media (max-width: $screen-xs-max) {
172
- .table-responsive {
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
+
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: scroll;
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 {
@@ -1,3 +1,8 @@
1
+ /*!
2
+ * Bootstrap v3.3.5 (http://getbootstrap.com)
3
+ * Copyright 2011-2015 Twitter, Inc.
4
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
5
+ */
1
6
 
2
7
  //
3
8
  // Load core variables and mixins
@@ -7,7 +12,6 @@
7
12
  @import "mixins";
8
13
 
9
14
 
10
-
11
15
  //
12
16
  // Buttons
13
17
  // --------------------------------------------------
@@ -28,12 +32,22 @@
28
32
  &.active {
29
33
  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
30
34
  }
35
+
36
+ &.disabled,
37
+ &[disabled],
38
+ fieldset[disabled] & {
39
+ @include box-shadow(none);
40
+ }
41
+
42
+ .badge {
43
+ text-shadow: none;
44
+ }
31
45
  }
32
46
 
33
47
  // Mixin for generating new styles
34
48
  @mixin btn-styles($btn-color: #555) {
35
49
  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
36
- @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
50
+ @include reset-filter; // Disable gradients for IE9 because filter bleeds through rounded corners; see https://github.com/twbs/bootstrap/issues/10620
37
51
  background-repeat: repeat-x;
38
52
  border-color: darken($btn-color, 14%);
39
53
 
@@ -48,6 +62,20 @@
48
62
  background-color: darken($btn-color, 12%);
49
63
  border-color: darken($btn-color, 14%);
50
64
  }
65
+
66
+ &.disabled,
67
+ &[disabled],
68
+ fieldset[disabled] & {
69
+ &,
70
+ &:hover,
71
+ &:focus,
72
+ &.focus,
73
+ &:active,
74
+ &.active {
75
+ background-color: darken($btn-color, 12%);
76
+ background-image: none;
77
+ }
78
+ }
51
79
  }
52
80
 
53
81
  // Common styles
@@ -68,7 +96,6 @@
68
96
  .btn-danger { @include btn-styles($btn-danger-bg); }
69
97
 
70
98
 
71
-
72
99
  //
73
100
  // Images
74
101
  // --------------------------------------------------
@@ -79,7 +106,6 @@
79
106
  }
80
107
 
81
108
 
82
-
83
109
  //
84
110
  // Dropdowns
85
111
  // --------------------------------------------------
@@ -97,7 +123,6 @@
97
123
  }
98
124
 
99
125
 
100
-
101
126
  //
102
127
  // Navbar
103
128
  // --------------------------------------------------
@@ -105,13 +130,14 @@
105
130
  // Default navbar
106
131
  .navbar-default {
107
132
  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
108
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
133
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
109
134
  border-radius: $navbar-border-radius;
110
135
  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
111
136
  @include box-shadow($shadow);
112
137
 
138
+ .navbar-nav > .open > a,
113
139
  .navbar-nav > .active > a {
114
- @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
140
+ @include gradient-vertical($start-color: darken($navbar-default-link-active-bg, 5%), $end-color: darken($navbar-default-link-active-bg, 2%));
115
141
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
116
142
  }
117
143
  }
@@ -123,10 +149,11 @@
123
149
  // Inverted navbar
124
150
  .navbar-inverse {
125
151
  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
126
- @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
127
-
152
+ @include reset-filter; // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered; see https://github.com/twbs/bootstrap/issues/10257
153
+ border-radius: $navbar-border-radius;
154
+ .navbar-nav > .open > a,
128
155
  .navbar-nav > .active > a {
129
- @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
156
+ @include gradient-vertical($start-color: $navbar-inverse-link-active-bg, $end-color: lighten($navbar-inverse-link-active-bg, 2.5%));
130
157
  @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
131
158
  }
132
159
 
@@ -143,6 +170,17 @@
143
170
  border-radius: 0;
144
171
  }
145
172
 
173
+ // Fix active state of dropdown items in collapsed mode
174
+ @media (max-width: $grid-float-breakpoint-max) {
175
+ .navbar .navbar-nav .open .dropdown-menu > .active > a {
176
+ &,
177
+ &:hover,
178
+ &:focus {
179
+ color: #fff;
180
+ @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
181
+ }
182
+ }
183
+ }
146
184
 
147
185
 
148
186
  //
@@ -169,7 +207,6 @@
169
207
  .alert-danger { @include alert-styles($alert-danger-bg); }
170
208
 
171
209
 
172
-
173
210
  //
174
211
  // Progress bars
175
212
  // --------------------------------------------------
@@ -191,6 +228,11 @@
191
228
  .progress-bar-warning { @include progress-bar-styles($progress-bar-warning-bg); }
192
229
  .progress-bar-danger { @include progress-bar-styles($progress-bar-danger-bg); }
193
230
 
231
+ // Reset the striped class because our mixins don't do multiple gradients and
232
+ // the above custom styles override the new `.progress-bar-striped` in v3.2.0.
233
+ .progress-bar-striped {
234
+ @include gradient-striped;
235
+ }
194
236
 
195
237
 
196
238
  //
@@ -207,8 +249,11 @@
207
249
  text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
208
250
  @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
209
251
  border-color: darken($list-group-active-border, 7.5%);
210
- }
211
252
 
253
+ .badge {
254
+ text-shadow: none;
255
+ }
256
+ }
212
257
 
213
258
 
214
259
  //
@@ -234,7 +279,6 @@
234
279
  .panel-danger > .panel-heading { @include panel-heading-styles($panel-danger-heading-bg); }
235
280
 
236
281
 
237
-
238
282
  //
239
283
  // Wells
240
284
  // --------------------------------------------------
@@ -12,11 +12,11 @@
12
12
  background-color: $thumbnail-bg;
13
13
  border: 1px solid $thumbnail-border;
14
14
  border-radius: $thumbnail-border-radius;
15
- @include transition(all .2s ease-in-out);
15
+ @include transition(border .2s ease-in-out);
16
16
 
17
17
  > img,
18
18
  a > img {
19
- @include img-responsive();
19
+ @include img-responsive;
20
20
  margin-left: auto;
21
21
  margin-right: auto;
22
22
  }
@@ -8,9 +8,11 @@
8
8
  position: absolute;
9
9
  z-index: $zindex-tooltip;
10
10
  display: block;
11
- visibility: visible;
11
+ // Our parent element can be arbitrary since tooltips are by default inserted as a sibling of their target element.
12
+ // So reset our font and text properties to avoid inheriting weird values.
13
+ @include reset-text;
12
14
  font-size: $font-size-small;
13
- line-height: 1.4;
15
+
14
16
  @include opacity(0);
15
17
 
16
18
  &.in { @include opacity($tooltip-opacity); }
@@ -26,7 +28,6 @@
26
28
  padding: 3px 8px;
27
29
  color: $tooltip-color;
28
30
  text-align: center;
29
- text-decoration: none;
30
31
  background-color: $tooltip-bg;
31
32
  border-radius: $border-radius-base;
32
33
  }
@@ -39,6 +40,7 @@
39
40
  border-color: transparent;
40
41
  border-style: solid;
41
42
  }
43
+ // Note: Deprecated .top-left, .top-right, .bottom-left, and .bottom-right as of v3.3.1
42
44
  .tooltip {
43
45
  &.top .tooltip-arrow {
44
46
  bottom: 0;
@@ -49,13 +51,15 @@
49
51
  }
50
52
  &.top-left .tooltip-arrow {
51
53
  bottom: 0;
52
- left: $tooltip-arrow-width;
54
+ right: $tooltip-arrow-width;
55
+ margin-bottom: -$tooltip-arrow-width;
53
56
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
54
57
  border-top-color: $tooltip-arrow-color;
55
58
  }
56
59
  &.top-right .tooltip-arrow {
57
60
  bottom: 0;
58
- right: $tooltip-arrow-width;
61
+ left: $tooltip-arrow-width;
62
+ margin-bottom: -$tooltip-arrow-width;
59
63
  border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
60
64
  border-top-color: $tooltip-arrow-color;
61
65
  }
@@ -82,13 +86,15 @@
82
86
  }
83
87
  &.bottom-left .tooltip-arrow {
84
88
  top: 0;
85
- left: $tooltip-arrow-width;
89
+ right: $tooltip-arrow-width;
90
+ margin-top: -$tooltip-arrow-width;
86
91
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
87
92
  border-bottom-color: $tooltip-arrow-color;
88
93
  }
89
94
  &.bottom-right .tooltip-arrow {
90
95
  top: 0;
91
- right: $tooltip-arrow-width;
96
+ left: $tooltip-arrow-width;
97
+ margin-top: -$tooltip-arrow-width;
92
98
  border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
93
99
  border-bottom-color: $tooltip-arrow-color;
94
100
  }