anjlab-bootstrap-rails 2.2.2.rc → 2.2.2.rc1

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.
data/README.md CHANGED
@@ -1,4 +1,4 @@
1
- # Twitter Bootstrap v2.2.1 for Rails 3
1
+ # Twitter Bootstrap v2.2.2.rc for Rails 3
2
2
  Bootstrap is a toolkit from Twitter designed to kickstart development of webapps and sites.
3
3
  It includes base CSS and HTML for typography, forms, buttons, tables, grids, navigation, and more.
4
4
 
@@ -1,5 +1,5 @@
1
1
  module Bootstrap
2
2
  module Rails
3
- VERSION = "2.2.2.rc"
3
+ VERSION = "2.2.2.rc1"
4
4
  end
5
5
  end
@@ -140,9 +140,9 @@
140
140
  * =================================== */
141
141
 
142
142
  $(document)
143
- .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
144
143
  .on('click.dropdown.data-api touchstart.dropdown.data-api', clearMenus)
145
144
  .on('click.dropdown touchstart.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
145
+ .on('touchstart.dropdown.data-api', '.dropdown-menu', function (e) { e.stopPropagation() })
146
146
  .on('click.dropdown.data-api touchstart.dropdown.data-api' , toggle, Dropdown.prototype.toggle)
147
147
  .on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
148
148
 
@@ -44,7 +44,7 @@
44
44
  , content = this.getContent()
45
45
 
46
46
  $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
47
- $tip.find('.popover-content > *')[this.options.html ? 'html' : 'text'](content)
47
+ $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
48
48
 
49
49
  $tip.removeClass('fade top bottom left right in')
50
50
  }
@@ -97,7 +97,7 @@
97
97
  placement: 'right'
98
98
  , trigger: 'click'
99
99
  , content: ''
100
- , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
100
+ , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"></div></div></div>'
101
101
  })
102
102
 
103
- }(window.jQuery);
103
+ }(window.jQuery);
@@ -40,17 +40,27 @@
40
40
  border-color: $successBorder;
41
41
  color: $successText;
42
42
  }
43
+ .alert-success h4 {
44
+ color: $successText;
45
+ }
43
46
  .alert-danger,
44
47
  .alert-error {
45
48
  background-color: $errorBackground;
46
49
  border-color: $errorBorder;
47
50
  color: $errorText;
48
51
  }
52
+ .alert-danger h4,
53
+ .alert-error h4 {
54
+ color: $errorText;
55
+ }
49
56
  .alert-info {
50
57
  background-color: $infoBackground;
51
58
  border-color: $infoBorder;
52
59
  color: $infoText;
53
60
  }
61
+ .alert-info h4 {
62
+ color: $infoText;
63
+ }
54
64
 
55
65
 
56
66
  // Block alerts
@@ -9,16 +9,16 @@
9
9
  list-style: none;
10
10
  background-color: #f5f5f5;
11
11
  @include border-radius($baseBorderRadius);
12
- li {
12
+ > li {
13
13
  display: inline-block;
14
14
  @include ie7-inline-block();
15
15
  text-shadow: 0 1px 0 $white;
16
16
  }
17
- .divider {
17
+ > .divider {
18
18
  padding: 0 5px;
19
19
  color: #ccc;
20
20
  }
21
- .active {
21
+ > .active {
22
22
  color: $grayLight;
23
23
  }
24
24
  }
@@ -15,7 +15,7 @@
15
15
  position: relative;
16
16
  }
17
17
 
18
- .carousel {
18
+ .carousel-inner {
19
19
 
20
20
  > .item {
21
21
  display: none;
@@ -672,7 +672,10 @@ legend + .control-group {
672
672
  // And apply it only to .help-block instances that follow a form control
673
673
  input,
674
674
  select,
675
- textarea {
675
+ textarea,
676
+ .uneditable-input,
677
+ .input-prepend,
678
+ .input-append {
676
679
  + .help-block {
677
680
  margin-top: $baseLineHeight / 2;
678
681
  }
@@ -58,6 +58,7 @@
58
58
 
59
59
  // Body (where all modal content resides)
60
60
  .modal-body {
61
+ position: relative;
61
62
  overflow-y: auto;
62
63
  max-height: 400px;
63
64
  padding: 15px;
@@ -21,6 +21,12 @@
21
21
  background-color: $grayLighter;
22
22
  }
23
23
 
24
+ // Prevent IE8 from misplacing imgs
25
+ // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
26
+ .nav > li > a > img {
27
+ max-width: none;
28
+ }
29
+
24
30
  // Redeclare pull classes because of specifity
25
31
  .nav > .pull-right {
26
32
  float: right;
@@ -11,6 +11,7 @@
11
11
  display: none;
12
12
  width: 236px;
13
13
  padding: 1px;
14
+ text-align: left; // Reset given new insertion method
14
15
  background-color: $popoverBackground;
15
16
  -webkit-background-clip: padding-box;
16
17
  -moz-background-clip: padding;
@@ -43,9 +44,6 @@
43
44
 
44
45
  .popover-content {
45
46
  padding: 9px 14px;
46
- p, ul, ol {
47
- margin-bottom: 0;
48
- }
49
47
  }
50
48
 
51
49
  // Arrows
@@ -14,6 +14,15 @@
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
+
17
26
  // REPEAT VARIABLES & MIXINS
18
27
  // -------------------------
19
28
  // Required since we compile the responsive stuff separately
metadata CHANGED
@@ -2,14 +2,14 @@
2
2
  name: anjlab-bootstrap-rails
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 2.2.2.rc
5
+ version: 2.2.2.rc1
6
6
  platform: ruby
7
7
  authors:
8
8
  - Yury Korolev
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-28 00:00:00.000000000 Z
12
+ date: 2012-12-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  version_requirements: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
168
168
  version: '0'
169
169
  segments:
170
170
  - 0
171
- hash: -1093427819150500241
171
+ hash: 629169741563936471
172
172
  none: false
173
173
  required_rubygems_version: !ruby/object:Gem::Requirement
174
174
  requirements: