bootstrap-sass 2.2.1.1 → 2.2.2.0

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.

Potentially problematic release.


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

Files changed (35) hide show
  1. data/README.md +2 -2
  2. data/vendor/assets/javascripts/bootstrap-affix.js +12 -1
  3. data/vendor/assets/javascripts/bootstrap-alert.js +12 -1
  4. data/vendor/assets/javascripts/bootstrap-button.js +12 -1
  5. data/vendor/assets/javascripts/bootstrap-carousel.js +11 -2
  6. data/vendor/assets/javascripts/bootstrap-collapse.js +15 -4
  7. data/vendor/assets/javascripts/bootstrap-dropdown.js +16 -3
  8. data/vendor/assets/javascripts/bootstrap-modal.js +12 -1
  9. data/vendor/assets/javascripts/bootstrap-popover.js +14 -3
  10. data/vendor/assets/javascripts/bootstrap-scrollspy.js +13 -2
  11. data/vendor/assets/javascripts/bootstrap-tab.js +12 -1
  12. data/vendor/assets/javascripts/bootstrap-tooltip.js +12 -1
  13. data/vendor/assets/javascripts/bootstrap-transition.js +1 -1
  14. data/vendor/assets/javascripts/bootstrap-typeahead.js +23 -10
  15. data/vendor/assets/stylesheets/bootstrap/_alerts.scss +14 -0
  16. data/vendor/assets/stylesheets/bootstrap/_breadcrumbs.scss +5 -5
  17. data/vendor/assets/stylesheets/bootstrap/_button-groups.scss +27 -42
  18. data/vendor/assets/stylesheets/bootstrap/_buttons.scss +5 -7
  19. data/vendor/assets/stylesheets/bootstrap/_carousel.scss +15 -15
  20. data/vendor/assets/stylesheets/bootstrap/_code.scss +3 -0
  21. data/vendor/assets/stylesheets/bootstrap/_dropdowns.scss +5 -9
  22. data/vendor/assets/stylesheets/bootstrap/_forms.scss +12 -8
  23. data/vendor/assets/stylesheets/bootstrap/_labels-badges.scss +25 -15
  24. data/vendor/assets/stylesheets/bootstrap/_mixins.scss +3 -3
  25. data/vendor/assets/stylesheets/bootstrap/_modals.scss +1 -1
  26. data/vendor/assets/stylesheets/bootstrap/_navbar.scss +22 -4
  27. data/vendor/assets/stylesheets/bootstrap/_navs.scss +6 -0
  28. data/vendor/assets/stylesheets/bootstrap/_popovers.scss +50 -38
  29. data/vendor/assets/stylesheets/bootstrap/_reset.scss +82 -4
  30. data/vendor/assets/stylesheets/bootstrap/_tables.scss +36 -35
  31. data/vendor/assets/stylesheets/bootstrap/_type.scss +29 -21
  32. data/vendor/assets/stylesheets/bootstrap/_variables.scss +7 -7
  33. data/vendor/assets/stylesheets/bootstrap/bootstrap.scss +1 -1
  34. data/vendor/assets/stylesheets/bootstrap/responsive.scss +10 -1
  35. metadata +4 -3
@@ -20,33 +20,27 @@ p {
20
20
  // Emphasis & misc
21
21
  // -------------------------
22
22
 
23
- small {
24
- font-size: 85%; // Ex: 14px base font * 85% = about 12px
25
- }
26
- strong {
27
- font-weight: bold;
28
- }
29
- em {
30
- font-style: italic;
31
- }
32
- cite {
33
- font-style: normal;
34
- }
23
+ // Ex: 14px base font * 85% = about 12px
24
+ small { font-size: 85%; }
25
+
26
+ strong { font-weight: bold; }
27
+ em { font-style: italic; }
28
+ cite { font-style: normal; }
35
29
 
36
30
  // Utility classes
37
- .muted {
38
- color: $grayLight;
39
- }
40
- .text-warning { color: $warningText; }
31
+ .muted { color: $grayLight; }
32
+ a.muted:hover { color: darken($grayLight, 10%); }
33
+
34
+ .text-warning { color: $warningText; }
41
35
  a.text-warning:hover { color: darken($warningText, 10%); }
42
36
 
43
- .text-error { color: $errorText; }
44
- a.text-error:hover { color: darken($errorText, 10%); }
37
+ .text-error { color: $errorText; }
38
+ a.text-error:hover { color: darken($errorText, 10%); }
45
39
 
46
- .text-info { color: $infoText; }
47
- a.text-info:hover { color: darken($infoText, 10%); }
40
+ .text-info { color: $infoText; }
41
+ a.text-info:hover { color: darken($infoText, 10%); }
48
42
 
49
- .text-success { color: $successText; }
43
+ .text-success { color: $successText; }
50
44
  a.text-success:hover { color: darken($successText, 10%); }
51
45
 
52
46
 
@@ -112,12 +106,26 @@ ol ul {
112
106
  li {
113
107
  line-height: $baseLineHeight;
114
108
  }
109
+
110
+ // Remove default list styles
115
111
  ul.unstyled,
116
112
  ol.unstyled {
117
113
  margin-left: 0;
118
114
  list-style: none;
119
115
  }
120
116
 
117
+ // Single-line list items
118
+ ul.inline,
119
+ ol.inline {
120
+ margin-left: 0;
121
+ list-style: none;
122
+ & > li {
123
+ display: inline-block;
124
+ padding-left: 5px;
125
+ padding-right: 5px;
126
+ }
127
+ }
128
+
121
129
  // Description Lists
122
130
  dl {
123
131
  margin-bottom: $baseLineHeight;
@@ -66,13 +66,13 @@ $fontSizeLarge: $baseFontSize * 1.25; // ~18px
66
66
  $fontSizeSmall: $baseFontSize * 0.85; // ~12px
67
67
  $fontSizeMini: $baseFontSize * 0.75; // ~11px
68
68
 
69
- $paddingLarge: 11px 19px; // 44px
70
- $paddingSmall: 2px 10px; // 26px
71
- $paddingMini: 1px 6px; // 24px
69
+ $paddingLarge: 11px 19px !default; // 44px
70
+ $paddingSmall: 2px 10px !default; // 26px
71
+ $paddingMini: 0px 6px !default; // 22px
72
72
 
73
- $baseBorderRadius: 4px;
74
- $borderRadiusLarge: 6px;
75
- $borderRadiusSmall: 3px;
73
+ $baseBorderRadius: 4px !default;
74
+ $borderRadiusLarge: 6px !default;
75
+ $borderRadiusSmall: 3px !default;
76
76
 
77
77
 
78
78
  // Tables
@@ -167,7 +167,7 @@ $hrBorder: $grayLighter !default;
167
167
 
168
168
  // Horizontal forms & lists
169
169
  // -------------------------
170
- $horizontalComponentOffset: 180px;
170
+ $horizontalComponentOffset: 180px !default;
171
171
 
172
172
 
173
173
  // Wells
@@ -1,5 +1,5 @@
1
1
  /*!
2
- * Bootstrap v2.2.1
2
+ * Bootstrap v2.2.2
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.1
2
+ * Bootstrap Responsive v2.2.2
3
3
  *
4
4
  * Copyright 2012 Twitter, Inc
5
5
  * Licensed under the Apache License v2.0
@@ -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
@@ -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.1.1
4
+ version: 2.2.2.0
5
5
  prerelease:
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: 2012-11-18 00:00:00.000000000 Z
12
+ date: 2012-12-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: compass
@@ -133,7 +133,8 @@ files:
133
133
  - README.md
134
134
  - LICENSE
135
135
  homepage: http://github.com/thomas-mcdonald/bootstrap-sass
136
- licenses: []
136
+ licenses:
137
+ - Apache 2.0
137
138
  post_install_message:
138
139
  rdoc_options: []
139
140
  require_paths: