bootstrap-sass 2.2.2.0 → 2.3.0.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of bootstrap-sass might be problematic. Click here for more details.

Files changed (42) hide show
  1. data/README.md +44 -22
  2. data/lib/bootstrap-sass.rb +3 -1
  3. data/vendor/assets/javascripts/bootstrap-affix.js +1 -1
  4. data/vendor/assets/javascripts/bootstrap-alert.js +1 -1
  5. data/vendor/assets/javascripts/bootstrap-button.js +1 -1
  6. data/vendor/assets/javascripts/bootstrap-carousel.js +31 -9
  7. data/vendor/assets/javascripts/bootstrap-collapse.js +4 -4
  8. data/vendor/assets/javascripts/bootstrap-dropdown.js +14 -10
  9. data/vendor/assets/javascripts/bootstrap-modal.js +13 -11
  10. data/vendor/assets/javascripts/bootstrap-popover.js +5 -5
  11. data/vendor/assets/javascripts/bootstrap-scrollspy.js +2 -2
  12. data/vendor/assets/javascripts/bootstrap-tab.js +1 -1
  13. data/vendor/assets/javascripts/bootstrap-tooltip.js +95 -29
  14. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  15. data/vendor/assets/javascripts/bootstrap-typeahead.js +16 -4
  16. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +4 -2
  17. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +8 -10
  18. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +33 -6
  19. data/vendor/assets/stylesheets/bootstrap/_close.scss +2 -1
  20. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +16 -12
  21. data/vendor/assets/stylesheets/bootstrap/_forms.scss +5 -2
  22. data/vendor/assets/stylesheets/bootstrap/_labels-badges.scss +4 -2
  23. data/vendor/assets/stylesheets/bootstrap/_media.scss +2 -2
  24. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +6 -0
  25. data/vendor/assets/stylesheets/bootstrap/_modals.scss +3 -3
  26. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +18 -11
  27. data/vendor/assets/stylesheets/bootstrap/_navs.scss +39 -21
  28. data/vendor/assets/stylesheets/bootstrap/_pager.scss +3 -1
  29. data/vendor/assets/stylesheets/bootstrap/_pagination.scss +3 -1
  30. data/vendor/assets/stylesheets/bootstrap/_popovers.scss +5 -1
  31. data/vendor/assets/stylesheets/bootstrap/_responsive-navbar.scss +6 -2
  32. data/vendor/assets/stylesheets/bootstrap/_responsive-utilities.scss +29 -13
  33. data/vendor/assets/stylesheets/bootstrap/_scaffolding.scss +2 -1
  34. data/vendor/assets/stylesheets/bootstrap/_sprites.scss +7 -3
  35. data/vendor/assets/stylesheets/bootstrap/_tables.scss +24 -17
  36. data/vendor/assets/stylesheets/bootstrap/_thumbnails.scss +3 -2
  37. data/vendor/assets/stylesheets/bootstrap/_tooltip.scss +6 -6
  38. data/vendor/assets/stylesheets/bootstrap/_type.scss +20 -8
  39. data/vendor/assets/stylesheets/bootstrap/_variables.scss +2 -2
  40. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +1 -1
  41. data/vendor/assets/stylesheets/bootstrap/responsive.scss +1 -10
  42. metadata +9 -24
@@ -81,7 +81,9 @@
81
81
  margin-bottom: 2px;
82
82
  }
83
83
  .nav-collapse .nav > li > a:hover,
84
- .nav-collapse .dropdown-menu a:hover {
84
+ .nav-collapse .nav > li > a:focus,
85
+ .nav-collapse .dropdown-menu a:hover,
86
+ .nav-collapse .dropdown-menu a:focus {
85
87
  background-color: $navbarBackground;
86
88
  }
87
89
  .navbar-inverse .nav-collapse .nav > li > a,
@@ -89,7 +91,9 @@
89
91
  color: $navbarInverseLinkColor;
90
92
  }
91
93
  .navbar-inverse .nav-collapse .nav > li > a:hover,
92
- .navbar-inverse .nav-collapse .dropdown-menu a:hover {
94
+ .navbar-inverse .nav-collapse .nav > li > a:focus,
95
+ .navbar-inverse .nav-collapse .dropdown-menu a:hover,
96
+ .navbar-inverse .nav-collapse .dropdown-menu a:focus {
93
97
  background-color: $navbarInverseBackground;
94
98
  }
95
99
  // Buttons in the navbar
@@ -3,19 +3,11 @@
3
3
  // --------------------------------------------------
4
4
 
5
5
 
6
- // Clearing floats
7
- .clearfix {
8
- @include clearfix();
9
- }
10
-
11
- // Accessible yet invisible text
12
- .hide-text {
13
- @include hide-text();
14
- }
15
-
16
- // Uses box-sizing mixin, so must be defined here
17
- .input-block-level {
18
- @include input-block-level();
6
+ // IE10 Metro responsive
7
+ // Required for Windows 8 Metro split-screen snapping with IE10
8
+ // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
9
+ @-ms-viewport{
10
+ width: device-width;
19
11
  }
20
12
 
21
13
  // Hide from screenreaders and browsers
@@ -56,3 +48,27 @@
56
48
  // Hide
57
49
  .hidden-phone { display: none !important; }
58
50
  }
51
+
52
+ // Print utilities
53
+ .visible-print { display: none !important; }
54
+ .hidden-print { }
55
+
56
+ @media print {
57
+ .visible-print { display: inherit !important; }
58
+ .hidden-print { display: none !important; }
59
+ }
60
+
61
+ // Clearing floats
62
+ .clearfix {
63
+ @include clearfix();
64
+ }
65
+
66
+ // Accessible yet invisible text
67
+ .hide-text {
68
+ @include hide-text();
69
+ }
70
+
71
+ // Uses box-sizing mixin, so must be defined here
72
+ .input-block-level {
73
+ @include input-block-level();
74
+ }
@@ -23,7 +23,8 @@ a {
23
23
  color: $linkColor;
24
24
  text-decoration: none;
25
25
  }
26
- a:hover {
26
+ a:hover,
27
+ a:focus {
27
28
  color: $linkColorHover;
28
29
  text-decoration: underline;
29
30
  }
@@ -28,7 +28,7 @@
28
28
  margin-top: 1px;
29
29
  }
30
30
 
31
- /* White icons with optional class, or on hover/active states of certain elements */
31
+ /* White icons with optional class, or on hover/focus/active states of certain elements */
32
32
  .icon-white,
33
33
  .nav-pills > .active > a > [class^="icon-"],
34
34
  .nav-pills > .active > a > [class*=" icon-"],
@@ -37,11 +37,15 @@
37
37
  .navbar-inverse .nav > .active > a > [class^="icon-"],
38
38
  .navbar-inverse .nav > .active > a > [class*=" icon-"],
39
39
  .dropdown-menu > li > a:hover > [class^="icon-"],
40
+ .dropdown-menu > li > a:focus > [class^="icon-"],
40
41
  .dropdown-menu > li > a:hover > [class*=" icon-"],
42
+ .dropdown-menu > li > a:focus > [class*=" icon-"],
41
43
  .dropdown-menu > .active > a > [class^="icon-"],
42
44
  .dropdown-menu > .active > a > [class*=" icon-"],
43
45
  .dropdown-submenu:hover > a > [class^="icon-"],
44
- .dropdown-submenu:hover > a > [class*=" icon-"] {
46
+ .dropdown-submenu:focus > a > [class^="icon-"],
47
+ .dropdown-submenu:hover > a > [class*=" icon-"],
48
+ .dropdown-submenu:focus > a > [class*=" icon-"] {
45
49
  background-image: url($iconWhiteSpritePath);
46
50
  }
47
51
 
@@ -166,7 +170,7 @@
166
170
  .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
167
171
  .icon-retweet { background-position: -336px -120px; }
168
172
  .icon-shopping-cart { background-position: -360px -120px; }
169
- .icon-folder-close { background-position: -384px -120px; }
173
+ .icon-folder-close { background-position: -384px -120px; width: 16px; }
170
174
  .icon-folder-open { background-position: -408px -120px; width: 16px; }
171
175
  .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
172
176
  .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
@@ -93,24 +93,32 @@ table {
93
93
  tbody:first-child tr:first-child td {
94
94
  border-top: 0;
95
95
  }
96
- // For first th or td in the first row in the first thead or tbody
96
+ // For first th/td in the first row in the first thead or tbody
97
97
  thead:first-child tr:first-child > th:first-child,
98
- tbody:first-child tr:first-child > td:first-child {
98
+ tbody:first-child tr:first-child > td:first-child,
99
+ tbody:first-child tr:first-child > th:first-child {
99
100
  @include border-top-left-radius($baseBorderRadius);
100
101
  }
102
+ // For last th/td in the first row in the first thead or tbody
101
103
  thead:first-child tr:first-child > th:last-child,
102
- tbody:first-child tr:first-child > td:last-child {
104
+ tbody:first-child tr:first-child > td:last-child,
105
+ tbody:first-child tr:first-child > th:last-child {
103
106
  @include border-top-right-radius($baseBorderRadius);
104
107
  }
105
- // For first th or td in the last row in the last thead or tbody
108
+ // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
106
109
  thead:last-child tr:last-child > th:first-child,
107
110
  tbody:last-child tr:last-child > td:first-child,
108
- tfoot:last-child tr:last-child > td:first-child {
111
+ tbody:last-child tr:last-child > th:first-child,
112
+ tfoot:last-child tr:last-child > td:first-child,
113
+ tfoot:last-child tr:last-child > th:first-child {
109
114
  @include border-bottom-left-radius($baseBorderRadius);
110
115
  }
116
+ // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
111
117
  thead:last-child tr:last-child > th:last-child,
112
118
  tbody:last-child tr:last-child > td:last-child,
113
- tfoot:last-child tr:last-child > td:last-child {
119
+ tbody:last-child tr:last-child > th:last-child,
120
+ tfoot:last-child tr:last-child > td:last-child,
121
+ tfoot:last-child tr:last-child > th:last-child {
114
122
  @include border-bottom-right-radius($baseBorderRadius);
115
123
  }
116
124
 
@@ -122,7 +130,6 @@ table {
122
130
  @include border-bottom-right-radius(0);
123
131
  }
124
132
 
125
-
126
133
  // Special fixes to round the left border on the first td/th
127
134
  caption + thead tr:first-child th:first-child,
128
135
  caption + tbody tr:first-child td:first-child,
@@ -161,8 +168,8 @@ table {
161
168
  // Placed here since it has to come after the potential zebra striping
162
169
  .table-hover {
163
170
  tbody {
164
- tr:hover td,
165
- tr:hover th {
171
+ tr:hover > td,
172
+ tr:hover > th {
166
173
  background-color: $tableBackgroundHover;
167
174
  }
168
175
  }
@@ -197,32 +204,32 @@ table th[class*="span"],
197
204
  // Exact selectors below required to override .table-striped
198
205
 
199
206
  .table tbody tr {
200
- &.success td {
207
+ &.success > td {
201
208
  background-color: $successBackground;
202
209
  }
203
- &.error td {
210
+ &.error > td {
204
211
  background-color: $errorBackground;
205
212
  }
206
- &.warning td {
213
+ &.warning > td {
207
214
  background-color: $warningBackground;
208
215
  }
209
- &.info td {
216
+ &.info > td {
210
217
  background-color: $infoBackground;
211
218
  }
212
219
  }
213
220
 
214
221
  // Hover states for .table-hover
215
222
  .table-hover tbody tr {
216
- &.success:hover td {
223
+ &.success:hover > td {
217
224
  background-color: darken($successBackground, 5%);
218
225
  }
219
- &.error:hover td {
226
+ &.error:hover > td {
220
227
  background-color: darken($errorBackground, 5%);
221
228
  }
222
- &.warning:hover td {
229
+ &.warning:hover > td {
223
230
  background-color: darken($warningBackground, 5%);
224
231
  }
225
- &.info:hover td {
232
+ &.info:hover > td {
226
233
  background-color: darken($infoBackground, 5%);
227
234
  }
228
235
  }
@@ -33,8 +33,9 @@
33
33
  @include box-shadow(0 1px 3px rgba(0,0,0,.055));
34
34
  @include transition(all .2s ease-in-out);
35
35
  }
36
- // Add a hover state for linked versions only
37
- a.thumbnail:hover {
36
+ // Add a hover/focus state for linked versions only
37
+ a.thumbnail:hover,
38
+ a.thumbnail:focus {
38
39
  border-color: $linkColor;
39
40
  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
40
41
  }
@@ -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;
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.2.2
2
+ * Bootstrap v2.3.0
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.0
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-sass
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.2.2.0
4
+ version: 2.3.0.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-12-22 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: compass
16
- requirement: !ruby/object:Gem::Requirement
16
+ requirement: &70137773270260 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
- requirements:
27
- - - ! '>='
28
- - !ruby/object:Gem::Version
29
- version: '0'
24
+ version_requirements: *70137773270260
30
25
  - !ruby/object:Gem::Dependency
31
26
  name: sass-rails
32
- requirement: !ruby/object:Gem::Requirement
27
+ requirement: &70137773269740 !ruby/object:Gem::Requirement
33
28
  none: false
34
29
  requirements:
35
30
  - - ~>
@@ -37,15 +32,10 @@ dependencies:
37
32
  version: '3.2'
38
33
  type: :development
39
34
  prerelease: false
40
- version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
- requirements:
43
- - - ~>
44
- - !ruby/object:Gem::Version
45
- version: '3.2'
35
+ version_requirements: *70137773269740
46
36
  - !ruby/object:Gem::Dependency
47
37
  name: sass
48
- requirement: !ruby/object:Gem::Requirement
38
+ requirement: &70137773269240 !ruby/object:Gem::Requirement
49
39
  none: false
50
40
  requirements:
51
41
  - - ~>
@@ -53,12 +43,7 @@ dependencies:
53
43
  version: '3.2'
54
44
  type: :runtime
55
45
  prerelease: false
56
- version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
- requirements:
59
- - - ~>
60
- - !ruby/object:Gem::Version
61
- version: '3.2'
46
+ version_requirements: *70137773269240
62
47
  description:
63
48
  email: tom@conceptcoding.co.uk
64
49
  executables: []
@@ -153,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
153
138
  version: '0'
154
139
  requirements: []
155
140
  rubyforge_project:
156
- rubygems_version: 1.8.23
141
+ rubygems_version: 1.8.11
157
142
  signing_key:
158
143
  specification_version: 3
159
144
  summary: Twitter's Bootstrap, converted to Sass and ready to drop into Rails or Compass