bootstrap-sass-rails 2.0.2.2 → 2.0.3.0pre1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (79) hide show
  1. data/lib/bootstrap/sass/rails/version.rb +1 -1
  2. data/test/cases/usage_css_spec.rb +7 -4
  3. data/test/dummy/log/test.log +610 -0
  4. data/test/dummy/tmp/cache/assets/C29/E80/sprockets%2F8f076727207424919c7170c7157bbe37 +0 -0
  5. data/test/dummy/tmp/cache/assets/D04/3C0/sprockets%2F29d763bd40cc25622b1f04b876a5c3e3 +0 -0
  6. data/test/dummy/tmp/cache/assets/D3F/FA0/sprockets%2F22c8366fdbaaa2872b202dfe7376629f +0 -0
  7. data/test/dummy/tmp/cache/assets/D7C/3E0/sprockets%2F53c81ab87ec56a748428a59da9a5d5de +0 -0
  8. data/test/dummy/tmp/cache/assets/E3A/D90/sprockets%2Fce0dbefdb4416ebc42589ecdbf7d7857 +0 -0
  9. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_accordion.scssc +0 -0
  10. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_button-groups.scssc +0 -0
  11. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_buttons.scssc +0 -0
  12. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_close.scssc +0 -0
  13. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_code.scssc +0 -0
  14. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_component-animations.scssc +0 -0
  15. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_dropdowns.scssc +0 -0
  16. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_forms.scssc +0 -0
  17. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels-badges.scssc +0 -0
  18. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_layouts.scssc +0 -0
  19. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_mixins.scssc +0 -0
  20. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_modals.scssc +0 -0
  21. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_navbar.scssc +0 -0
  22. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_navs.scssc +0 -0
  23. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_progress-bars.scssc +0 -0
  24. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_reset.scssc +0 -0
  25. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-1200px-min.scssc +0 -0
  26. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-767px-max.scssc +0 -0
  27. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-768px-979px.scssc +0 -0
  28. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-navbar.scssc +0 -0
  29. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-utilities.scssc +0 -0
  30. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive.scssc +0 -0
  31. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_sprites.scssc +0 -0
  32. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_tables.scssc +0 -0
  33. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_thumbnails.scssc +0 -0
  34. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_type.scssc +0 -0
  35. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_variables.scssc +0 -0
  36. data/test/dummy/tmp/cache/sass/766526f7d87ffdf0401dde0ec8d49f976470392d/bootstrap.css.scssc +0 -0
  37. data/vendor/assets/javascripts/twitter/bootstrap/alert.js +28 -32
  38. data/vendor/assets/javascripts/twitter/bootstrap/button.js +29 -33
  39. data/vendor/assets/javascripts/twitter/bootstrap/carousel.js +27 -19
  40. data/vendor/assets/javascripts/twitter/bootstrap/collapse.js +44 -25
  41. data/vendor/assets/javascripts/twitter/bootstrap/dropdown.js +18 -10
  42. data/vendor/assets/javascripts/twitter/bootstrap/modal.js +25 -17
  43. data/vendor/assets/javascripts/twitter/bootstrap/popover.js +13 -10
  44. data/vendor/assets/javascripts/twitter/bootstrap/scrollspy.js +43 -17
  45. data/vendor/assets/javascripts/twitter/bootstrap/tab.js +12 -7
  46. data/vendor/assets/javascripts/twitter/bootstrap/tooltip.js +40 -35
  47. data/vendor/assets/javascripts/twitter/bootstrap/transition.js +30 -20
  48. data/vendor/assets/javascripts/twitter/bootstrap/typeahead.js +25 -11
  49. data/vendor/assets/stylesheets/twitter/bootstrap.css.scss +2 -3
  50. data/vendor/assets/stylesheets/twitter/bootstrap/_accordion.scss +5 -0
  51. data/vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss +55 -36
  52. data/vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss +16 -11
  53. data/vendor/assets/stylesheets/twitter/bootstrap/_close.scss +12 -1
  54. data/vendor/assets/stylesheets/twitter/bootstrap/_code.scss +4 -4
  55. data/vendor/assets/stylesheets/twitter/bootstrap/_component-animations.scss +5 -5
  56. data/vendor/assets/stylesheets/twitter/bootstrap/_dropdowns.scss +15 -20
  57. data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss +57 -29
  58. data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss +55 -0
  59. data/vendor/assets/stylesheets/twitter/bootstrap/_layouts.scss +1 -1
  60. data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss +54 -36
  61. data/vendor/assets/stylesheets/twitter/bootstrap/_modals.scss +2 -2
  62. data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss +64 -41
  63. data/vendor/assets/stylesheets/twitter/bootstrap/_navs.scss +36 -35
  64. data/vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.scss +16 -8
  65. data/vendor/assets/stylesheets/twitter/bootstrap/_reset.scss +3 -3
  66. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-1200px-min.scss +26 -0
  67. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.scss +150 -0
  68. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-768px-979px.scss +19 -0
  69. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.scss +146 -0
  70. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss +41 -0
  71. data/vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss +15 -338
  72. data/vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss +25 -5
  73. data/vendor/assets/stylesheets/twitter/bootstrap/_tables.scss +22 -6
  74. data/vendor/assets/stylesheets/twitter/bootstrap/_thumbnails.scss +14 -2
  75. data/vendor/assets/stylesheets/twitter/bootstrap/_type.scss +7 -6
  76. data/vendor/assets/stylesheets/twitter/bootstrap/_variables.scss +10 -5
  77. metadata +30 -17
  78. data/vendor/assets/stylesheets/twitter/bootstrap/_badges.scss +0 -36
  79. data/vendor/assets/stylesheets/twitter/bootstrap/_labels.scss +0 -38
@@ -19,13 +19,12 @@
19
19
  display: inline-block;
20
20
  width: 14px;
21
21
  height: 14px;
22
+ @include ie7-restore-right-whitespace();
22
23
  line-height: 14px;
23
24
  vertical-align: text-top;
24
25
  background-image: image-url($iconSpritePath);
25
26
  background-position: 14px 14px;
26
27
  background-repeat: no-repeat;
27
-
28
- @include ie7-restore-right-whitespace();
29
28
  }
30
29
  .icon-white {
31
30
  background-image: image-url($iconWhiteSpritePath);
@@ -149,10 +148,31 @@
149
148
  .icon-comment { background-position: -240px -120px; }
150
149
  .icon-magnet { background-position: -264px -120px; }
151
150
  .icon-chevron-up { background-position: -288px -120px; }
152
- .icon-chevron-down { background-position: -313px -119px; } // 1px off
151
+ .icon-chevron-down { background-position: -313px -119px; } // 1px, 1px off
153
152
  .icon-retweet { background-position: -336px -120px; }
154
153
  .icon-shopping-cart { background-position: -360px -120px; }
155
154
  .icon-folder-close { background-position: -384px -120px; }
156
155
  .icon-folder-open { background-position: -408px -120px; }
157
- .icon-resize-vertical { background-position: -432px -119px; }
158
- .icon-resize-horizontal { background-position: -456px -118px; }
156
+ .icon-resize-vertical { background-position: -432px -119px; } // 1px, 1px off
157
+ .icon-resize-horizontal { background-position: -456px -118px; } // 1px, 2px off
158
+
159
+ .icon-hdd { background-position: 0 -144px; }
160
+ .icon-bullhorn { background-position: -24px -144px; }
161
+ .icon-bell { background-position: -48px -144px; }
162
+ .icon-certificate { background-position: -72px -144px; }
163
+ .icon-thumbs-up { background-position: -96px -144px; }
164
+ .icon-thumbs-down { background-position: -120px -144px; }
165
+ .icon-hand-right { background-position: -144px -144px; }
166
+ .icon-hand-left { background-position: -168px -144px; }
167
+ .icon-hand-up { background-position: -192px -144px; }
168
+ .icon-hand-down { background-position: -216px -144px; }
169
+ .icon-circle-arrow-right { background-position: -240px -144px; }
170
+ .icon-circle-arrow-left { background-position: -264px -144px; }
171
+ .icon-circle-arrow-up { background-position: -288px -144px; }
172
+ .icon-circle-arrow-down { background-position: -312px -144px; }
173
+ .icon-globe { background-position: -336px -144px; }
174
+ .icon-wrench { background-position: -360px -144px; }
175
+ .icon-tasks { background-position: -384px -144px; }
176
+ .icon-filter { background-position: -408px -144px; }
177
+ .icon-briefcase { background-position: -432px -144px; }
178
+ .icon-fullscreen { background-position: -456px -144px; }
@@ -9,9 +9,9 @@
9
9
 
10
10
  table {
11
11
  max-width: 100%;
12
+ background-color: $tableBackground;
12
13
  border-collapse: collapse;
13
14
  border-spacing: 0;
14
- background-color: $tableBackground;
15
15
  }
16
16
 
17
17
  // BASELINE STYLES
@@ -37,6 +37,8 @@ table {
37
37
  vertical-align: bottom;
38
38
  }
39
39
  // Remove top border from thead by default
40
+ caption + thead tr:first-child th,
41
+ caption + thead tr:first-child td,
40
42
  colgroup + thead tr:first-child th,
41
43
  colgroup + thead tr:first-child td,
42
44
  thead:first-child tr:first-child th,
@@ -67,15 +69,21 @@ table {
67
69
 
68
70
  .table-bordered {
69
71
  border: 1px solid $tableBorder;
70
- border-left: 0;
71
72
  border-collapse: separate; // Done so we can round those corners!
72
73
  *border-collapse: collapsed; // IE7 can't round corners anyway
74
+ border-left: 0;
73
75
  @include border-radius(4px);
74
76
  th,
75
77
  td {
76
78
  border-left: 1px solid $tableBorder;
77
79
  }
78
80
  // Prevent a double border
81
+ caption + thead tr:first-child th,
82
+ caption + tbody tr:first-child th,
83
+ caption + tbody tr:first-child td,
84
+ colgroup + thead tr:first-child th,
85
+ colgroup + tbody tr:first-child th,
86
+ colgroup + tbody tr:first-child td,
79
87
  thead:first-child tr:first-child th,
80
88
  tbody:first-child tr:first-child th,
81
89
  tbody:first-child tr:first-child td {
@@ -84,20 +92,28 @@ table {
84
92
  // For first th or td in the first row in the first thead or tbody
85
93
  thead:first-child tr:first-child th:first-child,
86
94
  tbody:first-child tr:first-child td:first-child {
87
- @include border-radius(4px 0 0 0);
95
+ -webkit-border-top-left-radius: 4px;
96
+ border-top-left-radius: 4px;
97
+ -moz-border-radius-topleft: 4px;
88
98
  }
89
99
  thead:first-child tr:first-child th:last-child,
90
100
  tbody:first-child tr:first-child td:last-child {
91
- @include border-radius(0 4px 0 0);
101
+ -webkit-border-top-right-radius: 4px;
102
+ border-top-right-radius: 4px;
103
+ -moz-border-radius-topright: 4px;
92
104
  }
93
105
  // For first th or td in the first row in the first thead or tbody
94
106
  thead:last-child tr:last-child th:first-child,
95
107
  tbody:last-child tr:last-child td:first-child {
96
- @include border-radius(0 0 0 4px);
108
+ -webkit-border-bottom-left-radius: 4px;
109
+ border-bottom-left-radius: 4px;
110
+ -moz-border-radius-bottomleft: 4px;
97
111
  }
98
112
  thead:last-child tr:last-child th:last-child,
99
113
  tbody:last-child tr:last-child td:last-child {
100
- @include border-radius(0 0 4px 0);
114
+ -webkit-border-bottom-right-radius: 4px;
115
+ border-bottom-right-radius: 4px;
116
+ -moz-border-radius-bottomright: 4px;
101
117
  }
102
118
  }
103
119
 
@@ -1,15 +1,26 @@
1
1
  // THUMBNAILS
2
2
  // ----------
3
+ // Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
3
4
 
5
+ // Make wrapper ul behave like the grid
4
6
  .thumbnails {
5
7
  margin-left: -$gridGutterWidth;
6
8
  list-style: none;
7
9
  @include clearfix();
8
10
  }
11
+ // Fluid rows have no left margin
12
+ .row-fluid .thumbnails {
13
+ margin-left: 0;
14
+ }
15
+
16
+ // Float li to make thumbnails appear in a row
9
17
  .thumbnails > li {
10
- float: left;
11
- margin: 0 0 $baseLineHeight $gridGutterWidth;
18
+ float: left; // Explicity set the float since we don't require .span* classes
19
+ margin-bottom: $baseLineHeight;
20
+ margin-left: $gridGutterWidth;
12
21
  }
22
+
23
+ // The actual thumbnail (can be `a` or `div`)
13
24
  .thumbnail {
14
25
  display: block;
15
26
  padding: 4px;
@@ -23,6 +34,7 @@ a.thumbnail:hover {
23
34
  border-color: $linkColor;
24
35
  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
25
36
  }
37
+
26
38
  // Images and captions
27
39
  .thumbnail > img {
28
40
  display: block;
@@ -52,8 +52,8 @@ h2 {
52
52
  }
53
53
  }
54
54
  h3 {
55
- line-height: $baseLineHeight * 1.5;
56
55
  font-size: 18px;
56
+ line-height: $baseLineHeight * 1.5;
57
57
  small {
58
58
  font-size: 14px;
59
59
  }
@@ -136,9 +136,10 @@ dd {
136
136
  .dl-horizontal {
137
137
  dt {
138
138
  float: left;
139
- clear: left;
140
139
  width: 120px;
140
+ clear: left;
141
141
  text-align: right;
142
+ @include text-overflow();
142
143
  }
143
144
  dd {
144
145
  margin-left: 130px;
@@ -169,8 +170,8 @@ em {
169
170
 
170
171
  // Abbreviations and acronyms
171
172
  abbr[title] {
172
- border-bottom: 1px dotted #ddd;
173
173
  cursor: help;
174
+ border-bottom: 1px dotted #ddd;
174
175
  }
175
176
  abbr.initialism {
176
177
  font-size: 90%;
@@ -198,10 +199,10 @@ blockquote {
198
199
  // Float right with text-align: right
199
200
  &.pull-right {
200
201
  float: right;
201
- padding-left: 0;
202
202
  padding-right: 15px;
203
- border-left: 0;
203
+ padding-left: 0;
204
204
  border-right: 5px solid $grayLighter;
205
+ border-left: 0;
205
206
  p,
206
207
  small {
207
208
  text-align: right;
@@ -221,8 +222,8 @@ blockquote:after {
221
222
  address {
222
223
  display: block;
223
224
  margin-bottom: $baseLineHeight;
224
- line-height: $baseLineHeight;
225
225
  font-style: normal;
226
+ line-height: $baseLineHeight;
226
227
  }
227
228
 
228
229
  // Misc
@@ -44,10 +44,14 @@ $linkColorHover: darken($linkColor, 15%) !default;
44
44
 
45
45
  // Typography
46
46
  // -------------------------
47
+ $sansFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
48
+ $serifFontFamily: Georgia, "Times New Roman", Times, serif !default;
49
+ $monoFontFamily: Menlo, Monaco, Consolas, "Courier New", monospace !default;
50
+
47
51
  $baseFontSize: 13px !default;
48
- $baseFontFamily: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
52
+ $baseFontFamily: $sansFontFamily !default;
49
53
  $baseLineHeight: 18px !default;
50
- $altFontFamily: Georgia, "Times New Roman", Times, serif !default;
54
+ $altFontFamily: $serifFontFamily !default;
51
55
 
52
56
  $headingsFontFamily: inherit !default; // empty to use BS default, @baseFontFamily
53
57
  $headingsFontWeight: bold !default; // instead of browser default, bold
@@ -66,7 +70,7 @@ $tableBorder: #ddd !default; // table and cell border
66
70
  // -------------------------
67
71
  $btnBackground: $white !default;
68
72
  $btnBackgroundHighlight: darken($white, 10%) !default;
69
- $btnBorder: darken($white, 20%) !default;
73
+ $btnBorder: #ccc !default;
70
74
 
71
75
  $btnPrimaryBackground: $linkColor !default;
72
76
  $btnPrimaryBackgroundHighlight: adjust-hue($btnPrimaryBackground, 15%) !default;
@@ -91,8 +95,10 @@ $btnInverseBackgroundHighlight: $grayDarker !default;
91
95
  // -------------------------
92
96
  $inputBackground: $white !default;
93
97
  $inputBorder: #ccc !default;
98
+ $inputBorderRadius: 3px !default;
94
99
  $inputDisabledBackground: $grayLighter !default;
95
100
 
101
+ $formActionsBackground: #f5f5f5 !default;
96
102
 
97
103
  // Dropdowns
98
104
  // -------------------------
@@ -152,6 +158,7 @@ $navbarSearchBackground: lighten($navbarBackground, 25%) !default;
152
158
  $navbarSearchBackgroundFocus: $white !default;
153
159
  $navbarSearchBorder: darken($navbarSearchBackground, 30%) !default;
154
160
  $navbarSearchPlaceholderColor: #ccc !default;
161
+ $navbarBrandColor: $navbarLinkColor !default;
155
162
 
156
163
 
157
164
  // Hero unit
@@ -181,7 +188,6 @@ $infoBorder: darken(adjust_hue($infoBackground, -10deg), 7%) !defau
181
188
 
182
189
 
183
190
 
184
-
185
191
  // GRID
186
192
  // --------------------------------------------------
187
193
 
@@ -192,7 +198,6 @@ $gridColumnWidth: 60px !default;
192
198
  $gridGutterWidth: 20px !default;
193
199
  $gridRowWidth: ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
194
200
 
195
-
196
201
  // Fluid grid
197
202
  // -------------------------
198
203
  $fluidGridColumnWidth: 6.382978723% !default;
metadata CHANGED
@@ -1,19 +1,19 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2.2
5
- prerelease:
4
+ version: 2.0.3.0pre1
5
+ prerelease: 7
6
6
  platform: ruby
7
7
  authors:
8
8
  - Morton Jonuschat
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-21 00:00:00.000000000 Z
12
+ date: 2012-04-24 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70295569051260 !ruby/object:Gem::Requirement
16
+ requirement: &70169854784000 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.1'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70295569051260
24
+ version_requirements: *70169854784000
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass-rails
27
- requirement: &70295569049940 !ruby/object:Gem::Requirement
27
+ requirement: &70169854783500 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3.1'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70295569049940
35
+ version_requirements: *70169854783500
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70295569049460 !ruby/object:Gem::Requirement
38
+ requirement: &70169854783040 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: 0.9.2
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70295569049460
46
+ version_requirements: *70169854783040
47
47
  description: Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps,
48
48
  and more. It includes base CSS styles for typography, forms, buttons, tables, grids,
49
49
  navigation, alerts, and more.
@@ -76,7 +76,6 @@ files:
76
76
  - vendor/assets/javascripts/twitter/bootstrap.js
77
77
  - vendor/assets/stylesheets/twitter/bootstrap/_accordion.scss
78
78
  - vendor/assets/stylesheets/twitter/bootstrap/_alerts.scss
79
- - vendor/assets/stylesheets/twitter/bootstrap/_badges.scss
80
79
  - vendor/assets/stylesheets/twitter/bootstrap/_breadcrumbs.scss
81
80
  - vendor/assets/stylesheets/twitter/bootstrap/_button-groups.scss
82
81
  - vendor/assets/stylesheets/twitter/bootstrap/_buttons.scss
@@ -88,7 +87,7 @@ files:
88
87
  - vendor/assets/stylesheets/twitter/bootstrap/_forms.scss
89
88
  - vendor/assets/stylesheets/twitter/bootstrap/_grid.scss
90
89
  - vendor/assets/stylesheets/twitter/bootstrap/_hero-unit.scss
91
- - vendor/assets/stylesheets/twitter/bootstrap/_labels.scss
90
+ - vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss
92
91
  - vendor/assets/stylesheets/twitter/bootstrap/_layouts.scss
93
92
  - vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss
94
93
  - vendor/assets/stylesheets/twitter/bootstrap/_modals.scss
@@ -99,6 +98,11 @@ files:
99
98
  - vendor/assets/stylesheets/twitter/bootstrap/_popovers.scss
100
99
  - vendor/assets/stylesheets/twitter/bootstrap/_progress-bars.scss
101
100
  - vendor/assets/stylesheets/twitter/bootstrap/_reset.scss
101
+ - vendor/assets/stylesheets/twitter/bootstrap/_responsive-1200px-min.scss
102
+ - vendor/assets/stylesheets/twitter/bootstrap/_responsive-767px-max.scss
103
+ - vendor/assets/stylesheets/twitter/bootstrap/_responsive-768px-979px.scss
104
+ - vendor/assets/stylesheets/twitter/bootstrap/_responsive-navbar.scss
105
+ - vendor/assets/stylesheets/twitter/bootstrap/_responsive-utilities.scss
102
106
  - vendor/assets/stylesheets/twitter/bootstrap/_responsive.scss
103
107
  - vendor/assets/stylesheets/twitter/bootstrap/_scaffolding.scss
104
108
  - vendor/assets/stylesheets/twitter/bootstrap/_sprites.scss
@@ -165,6 +169,7 @@ files:
165
169
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_forms.scssc
166
170
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_grid.scssc
167
171
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_hero-unit.scssc
172
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels-badges.scssc
168
173
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels.scssc
169
174
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_layouts.scssc
170
175
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_mixins.scssc
@@ -177,6 +182,11 @@ files:
177
182
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_popovers.scssc
178
183
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_progress-bars.scssc
179
184
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_reset.scssc
185
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-1200px-min.scssc
186
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-767px-max.scssc
187
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-768px-979px.scssc
188
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-navbar.scssc
189
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-utilities.scssc
180
190
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive.scssc
181
191
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_scaffolding.scssc
182
192
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_sprites.scssc
@@ -220,16 +230,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
220
230
  version: '0'
221
231
  segments:
222
232
  - 0
223
- hash: 2187386807936269573
233
+ hash: -2862996145594083021
224
234
  required_rubygems_version: !ruby/object:Gem::Requirement
225
235
  none: false
226
236
  requirements:
227
- - - ! '>='
237
+ - - ! '>'
228
238
  - !ruby/object:Gem::Version
229
- version: '0'
230
- segments:
231
- - 0
232
- hash: 2187386807936269573
239
+ version: 1.3.1
233
240
  requirements: []
234
241
  rubyforge_project:
235
242
  rubygems_version: 1.8.17
@@ -290,6 +297,7 @@ test_files:
290
297
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_forms.scssc
291
298
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_grid.scssc
292
299
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_hero-unit.scssc
300
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels-badges.scssc
293
301
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels.scssc
294
302
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_layouts.scssc
295
303
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_mixins.scssc
@@ -302,6 +310,11 @@ test_files:
302
310
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_popovers.scssc
303
311
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_progress-bars.scssc
304
312
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_reset.scssc
313
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-1200px-min.scssc
314
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-767px-max.scssc
315
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-768px-979px.scssc
316
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-navbar.scssc
317
+ - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive-utilities.scssc
305
318
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_responsive.scssc
306
319
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_scaffolding.scssc
307
320
  - test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_sprites.scssc
@@ -1,36 +0,0 @@
1
- // BADGES
2
- // ------
3
-
4
- // Base
5
- .badge {
6
- padding: 1px 9px 2px;
7
- font-size: $baseFontSize * .925;
8
- font-weight: bold;
9
- white-space: nowrap;
10
- color: $white;
11
- background-color: $grayLight;
12
- @include border-radius(9px);
13
- }
14
-
15
- // Hover state
16
- .badge:hover {
17
- color: $white;
18
- text-decoration: none;
19
- cursor: pointer;
20
- }
21
-
22
- // Colors
23
- .badge-error { background-color: $errorText; }
24
- .badge-error:hover { background-color: darken($errorText, 10%); }
25
-
26
- .badge-warning { background-color: $orange; }
27
- .badge-warning:hover { background-color: darken($orange, 10%); }
28
-
29
- .badge-success { background-color: $successText; }
30
- .badge-success:hover { background-color: darken($successText, 10%); }
31
-
32
- .badge-info { background-color: $infoText; }
33
- .badge-info:hover { background-color: darken($infoText, 10%); }
34
-
35
- .badge-inverse { background-color: $grayDark; }
36
- .badge-inverse:hover { background-color: darken($grayDark, 10%); }