bootstrap-generators 2.2.2 → 2.3.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (78) hide show
  1. data/README.md +14 -14
  2. data/bootstrap-generators.gemspec +1 -1
  3. data/lib/bootstrap-generators.rb +0 -1
  4. data/lib/bootstrap/generators/version.rb +1 -1
  5. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.css.scss +9 -9
  6. data/lib/generators/bootstrap/install/templates/assets/stylesheets/bootstrap-variables.less +3 -3
  7. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.erb +1 -1
  8. data/lib/generators/bootstrap/install/templates/form_builders/form_builder/_form.html.haml +1 -1
  9. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.erb +1 -1
  10. data/lib/generators/bootstrap/install/templates/form_builders/simple_form/_form.html.haml +1 -1
  11. data/vendor/assets/javascripts/bootstrap-affix.js +1 -1
  12. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  13. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  14. data/vendor/assets/javascripts/bootstrap-carousel.js +32 -10
  15. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -4
  16. data/vendor/assets/javascripts/bootstrap-dropdown.js +14 -10
  17. data/vendor/assets/javascripts/bootstrap-modal.js +14 -12
  18. data/vendor/assets/javascripts/bootstrap-popover.js +5 -5
  19. data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
  20. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  21. data/vendor/assets/javascripts/bootstrap-tooltip.js +104 -30
  22. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  23. data/vendor/assets/javascripts/bootstrap-typeahead.js +16 -4
  24. data/vendor/assets/stylesheets/bootstrap-responsive.css +24 -7
  25. data/vendor/assets/stylesheets/bootstrap.css +238 -119
  26. data/vendor/twitter/bootstrap/less/bootstrap.less +4 -4
  27. data/vendor/twitter/bootstrap/less/button-groups.less +4 -2
  28. data/vendor/twitter/bootstrap/less/buttons.less +8 -10
  29. data/vendor/twitter/bootstrap/less/carousel.less +34 -7
  30. data/vendor/twitter/bootstrap/less/close.less +2 -1
  31. data/vendor/twitter/bootstrap/less/dropdowns.less +16 -12
  32. data/vendor/twitter/bootstrap/less/forms.less +5 -2
  33. data/vendor/twitter/bootstrap/less/labels-badges.less +4 -2
  34. data/vendor/twitter/bootstrap/less/media.less +2 -2
  35. data/vendor/twitter/bootstrap/less/mixins.less +24 -8
  36. data/vendor/twitter/bootstrap/less/navbar.less +20 -13
  37. data/vendor/twitter/bootstrap/less/navs.less +39 -21
  38. data/vendor/twitter/bootstrap/less/pager.less +3 -1
  39. data/vendor/twitter/bootstrap/less/pagination.less +3 -1
  40. data/vendor/twitter/bootstrap/less/popovers.less +5 -1
  41. data/vendor/twitter/bootstrap/less/responsive-767px-max.less +2 -2
  42. data/vendor/twitter/bootstrap/less/responsive-navbar.less +6 -2
  43. data/vendor/twitter/bootstrap/less/responsive-utilities.less +16 -0
  44. data/vendor/twitter/bootstrap/less/responsive.less +1 -10
  45. data/vendor/twitter/bootstrap/less/scaffolding.less +2 -1
  46. data/vendor/twitter/bootstrap/less/sprites.less +7 -3
  47. data/vendor/twitter/bootstrap/less/tables.less +24 -17
  48. data/vendor/twitter/bootstrap/less/thumbnails.less +3 -2
  49. data/vendor/twitter/bootstrap/less/tooltip.less +6 -6
  50. data/vendor/twitter/bootstrap/less/type.less +19 -7
  51. data/vendor/twitter/bootstrap/less/variables.less +3 -3
  52. data/vendor/twitter/bootstrap/sass/_button-groups.scss +4 -2
  53. data/vendor/twitter/bootstrap/sass/_buttons.scss +8 -10
  54. data/vendor/twitter/bootstrap/sass/_carousel.scss +33 -6
  55. data/vendor/twitter/bootstrap/sass/_close.scss +2 -1
  56. data/vendor/twitter/bootstrap/sass/_dropdowns.scss +16 -12
  57. data/vendor/twitter/bootstrap/sass/_forms.scss +5 -2
  58. data/vendor/twitter/bootstrap/sass/_labels-badges.scss +4 -2
  59. data/vendor/twitter/bootstrap/sass/_media.scss +2 -2
  60. data/vendor/twitter/bootstrap/sass/_mixins.scss +8 -2
  61. data/vendor/twitter/bootstrap/sass/_modals.scss +3 -3
  62. data/vendor/twitter/bootstrap/sass/_navbar.scss +18 -11
  63. data/vendor/twitter/bootstrap/sass/_navs.scss +39 -21
  64. data/vendor/twitter/bootstrap/sass/_pager.scss +3 -1
  65. data/vendor/twitter/bootstrap/sass/_pagination.scss +3 -1
  66. data/vendor/twitter/bootstrap/sass/_popovers.scss +5 -1
  67. data/vendor/twitter/bootstrap/sass/_responsive-navbar.scss +6 -2
  68. data/vendor/twitter/bootstrap/sass/_responsive-utilities.scss +29 -13
  69. data/vendor/twitter/bootstrap/sass/_scaffolding.scss +2 -1
  70. data/vendor/twitter/bootstrap/sass/_sprites.scss +7 -3
  71. data/vendor/twitter/bootstrap/sass/_tables.scss +24 -17
  72. data/vendor/twitter/bootstrap/sass/_thumbnails.scss +3 -2
  73. data/vendor/twitter/bootstrap/sass/_tooltip.scss +6 -6
  74. data/vendor/twitter/bootstrap/sass/_type.scss +20 -8
  75. data/vendor/twitter/bootstrap/sass/_variables.scss +4 -4
  76. data/vendor/twitter/bootstrap/sass/bootstrap.scss +1 -1
  77. data/vendor/twitter/bootstrap/sass/responsive.scss +1 -10
  78. metadata +38 -12
@@ -9,20 +9,20 @@
9
9
  z-index: $zindexTooltip;
10
10
  display: block;
11
11
  visibility: visible;
12
- padding: 5px;
13
12
  font-size: 11px;
13
+ line-height: 1.4;
14
14
  @include opacity(0);
15
15
  &.in { @include opacity(80); }
16
- &.top { margin-top: -3px; }
17
- &.right { margin-left: 3px; }
18
- &.bottom { margin-top: 3px; }
19
- &.left { margin-left: -3px; }
16
+ &.top { margin-top: -3px; padding: 5px 0; }
17
+ &.right { margin-left: 3px; padding: 0 5px; }
18
+ &.bottom { margin-top: 3px; padding: 5px 0; }
19
+ &.left { margin-left: -3px; padding: 0 5px; }
20
20
  }
21
21
 
22
22
  // Wrapper for the tooltip content
23
23
  .tooltip-inner {
24
24
  max-width: 200px;
25
- padding: 3px 8px;
25
+ padding: 8px;
26
26
  color: $tooltipColor;
27
27
  text-align: center;
28
28
  text-decoration: none;
@@ -11,7 +11,7 @@ p {
11
11
  }
12
12
  .lead {
13
13
  margin-bottom: $baseLineHeight;
14
- font-size: $baseFontSize * 1.5;;
14
+ font-size: $baseFontSize * 1.5;
15
15
  font-weight: 200;
16
16
  line-height: $baseLineHeight * 1.5;
17
17
  }
@@ -29,19 +29,28 @@ cite { font-style: normal; }
29
29
 
30
30
  // Utility classes
31
31
  .muted { color: $grayLight; }
32
- a.muted:hover { color: darken($grayLight, 10%); }
32
+ a.muted:hover,
33
+ a.muted:focus { color: darken($grayLight, 10%); }
33
34
 
34
35
  .text-warning { color: $warningText; }
35
- a.text-warning:hover { color: darken($warningText, 10%); }
36
+ a.text-warning:hover,
37
+ a.text-warning:focus { color: darken($warningText, 10%); }
36
38
 
37
39
  .text-error { color: $errorText; }
38
- a.text-error:hover { color: darken($errorText, 10%); }
40
+ a.text-error:hover,
41
+ a.text-error:focus { color: darken($errorText, 10%); }
39
42
 
40
43
  .text-info { color: $infoText; }
41
- a.text-info:hover { color: darken($infoText, 10%); }
44
+ a.text-info:hover,
45
+ a.text-info:focus { color: darken($infoText, 10%); }
42
46
 
43
47
  .text-success { color: $successText; }
44
- a.text-success:hover { color: darken($successText, 10%); }
48
+ a.text-success:hover,
49
+ a.text-success:focus { color: darken($successText, 10%); }
50
+
51
+ .text-left { text-align: left; }
52
+ .text-right { text-align: right; }
53
+ .text-center { text-align: center; }
45
54
 
46
55
 
47
56
  // Headings
@@ -119,8 +128,9 @@ ul.inline,
119
128
  ol.inline {
120
129
  margin-left: 0;
121
130
  list-style: none;
122
- & > li {
131
+ > li {
123
132
  display: inline-block;
133
+ @include ie7-inline-block();
124
134
  padding-left: 5px;
125
135
  padding-right: 5px;
126
136
  }
@@ -185,7 +195,9 @@ blockquote {
185
195
  border-left: 5px solid $grayLighter;
186
196
  p {
187
197
  margin-bottom: 0;
188
- @include font-shorthand(16px,300,$baseLineHeight * 1.25);
198
+ font-size: $baseFontSize * 1.25;
199
+ font-weight: 300;
200
+ line-height: 1.25;
189
201
  }
190
202
  small {
191
203
  display: block;
@@ -86,7 +86,7 @@ $tableBorder: #ddd !default; // table and cell border
86
86
  // -------------------------
87
87
  $btnBackground: $white !default;
88
88
  $btnBackgroundHighlight: darken($white, 10%) !default;
89
- $btnBorder: #bbb !default;
89
+ $btnBorder: #ccc !default;
90
90
 
91
91
  $btnPrimaryBackground: $linkColor !default;
92
92
  $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 20%) !default;
@@ -126,7 +126,7 @@ $dropdownDividerBottom: $white !default;
126
126
 
127
127
  $dropdownLinkColor: $grayDark !default;
128
128
  $dropdownLinkColorHover: $white !default;
129
- $dropdownLinkColorActive: $dropdownLinkColor !default;
129
+ $dropdownLinkColorActive: $white !default;
130
130
 
131
131
  $dropdownLinkBackgroundActive: $linkColor !default;
132
132
  $dropdownLinkBackgroundHover: $dropdownLinkBackgroundActive !default;
@@ -151,8 +151,8 @@ $zindexModal: 1050 !default;
151
151
 
152
152
  // Sprite icons path
153
153
  // -------------------------
154
- $iconSpritePath: "../img/glyphicons-halflings.png" !default;
155
- $iconWhiteSpritePath: "../img/glyphicons-halflings-white.png" !default;
154
+ $iconSpritePath: "glyphicons-halflings.png" !default;
155
+ $iconWhiteSpritePath: "glyphicons-halflings-white.png" !default;
156
156
 
157
157
 
158
158
  // Input placeholder text color
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.2.2
2
+ * Bootstrap v2.3.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap Responsive v2.2.2
2
+ * Bootstrap Responsive v2.3.1
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -14,15 +14,6 @@
14
14
  // -------------------------------------------------------------
15
15
 
16
16
 
17
- // IE10 Metro responsive
18
- // Required for Windows 8 Metro split-screen snapping with IE10
19
- // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
20
-
21
- @-ms-viewport{
22
- width: device-width;
23
- }
24
-
25
-
26
17
  // REPEAT VARIABLES & MIXINS
27
18
  // -------------------------
28
19
  // Required since we compile the responsive stuff separately
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-generators
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.2
4
+ version: 2.3.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,22 +9,27 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-04 00:00:00.000000000 Z
12
+ date: 2013-03-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
16
- requirement: &68675720 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 1.0.0
21
+ version: '1.0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *68675720
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ~>
28
+ - !ruby/object:Gem::Version
29
+ version: '1.0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: test-unit
27
- requirement: &68675470 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :development
34
39
  prerelease: false
35
- version_requirements: *68675470
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: rails
38
- requirement: &68691260 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ~>
@@ -43,10 +53,15 @@ dependencies:
43
53
  version: '3.1'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *68691260
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '3.1'
47
62
  - !ruby/object:Gem::Dependency
48
63
  name: railties
49
- requirement: &68690420 !ruby/object:Gem::Requirement
64
+ requirement: !ruby/object:Gem::Requirement
50
65
  none: false
51
66
  requirements:
52
67
  - - ~>
@@ -54,7 +69,12 @@ dependencies:
54
69
  version: '3.1'
55
70
  type: :runtime
56
71
  prerelease: false
57
- version_requirements: *68690420
72
+ version_requirements: !ruby/object:Gem::Requirement
73
+ none: false
74
+ requirements:
75
+ - - ~>
76
+ - !ruby/object:Gem::Version
77
+ version: '3.1'
58
78
  description: Bootstrap-generators provides Twitter Bootstrap generators for Rails
59
79
  3.1. Checkout http://twitter.github.com/bootstrap.
60
80
  email:
@@ -218,15 +238,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
218
238
  - - ! '>='
219
239
  - !ruby/object:Gem::Version
220
240
  version: '0'
241
+ segments:
242
+ - 0
243
+ hash: -588882851
221
244
  required_rubygems_version: !ruby/object:Gem::Requirement
222
245
  none: false
223
246
  requirements:
224
247
  - - ! '>='
225
248
  - !ruby/object:Gem::Version
226
249
  version: '0'
250
+ segments:
251
+ - 0
252
+ hash: -588882851
227
253
  requirements: []
228
254
  rubyforge_project: bootstrap-generators
229
- rubygems_version: 1.8.10
255
+ rubygems_version: 1.8.25
230
256
  signing_key:
231
257
  specification_version: 3
232
258
  summary: Bootstrap-generators provides Twitter Bootstrap generators for Rails 3.1.