contour 1.2.0.pre7 → 1.2.0.pre8

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.
@@ -1125,6 +1125,14 @@
1125
1125
  }
1126
1126
 
1127
1127
  , enter: function (e) {
1128
+ // Added by Contour
1129
+ // https://github.com/twitter/bootstrap/issues/6232#issuecomment-13458685
1130
+ if (this.options.trigger == 'hover' && 'ontouchstart' in document.documentElement) {
1131
+ // Block tooltip event on touch devices since it swallows click events
1132
+ return;
1133
+ }
1134
+ // End of Added by Contour
1135
+
1128
1136
  var self = $(e.currentTarget)[this.type](this._options).data(this.type)
1129
1137
 
1130
1138
  if (!self.options.delay || !self.options.delay.show) return self.show()
@@ -2265,4 +2273,4 @@
2265
2273
  })
2266
2274
 
2267
2275
 
2268
- }(window.jQuery);
2276
+ }(window.jQuery);
@@ -36,7 +36,7 @@
36
36
  background-color: transparent;
37
37
  }
38
38
 
39
- body { padding-top: 60px; }
39
+ body { padding-top: 60px; padding-bottom: 60px; }
40
40
 
41
41
  h1, h2, h3, h4, h5, h6 {
42
42
  font-weight: 300;
@@ -3,7 +3,7 @@ module Contour
3
3
  MAJOR = 1
4
4
  MINOR = 2
5
5
  TINY = 0
6
- BUILD = "pre7" # nil, "pre", "rc", "rc2"
6
+ BUILD = "pre8" # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.0.pre7
4
+ version: 1.2.0.pre8
5
5
  prerelease: 6
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-02-12 00:00:00.000000000 Z
12
+ date: 2013-02-14 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails