bootstrap-sass-rails 2.0.2.0 → 2.0.2.1

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.
Files changed (12) hide show
  1. data/lib/bootstrap/sass/rails/version.rb +1 -1
  2. data/test/dummy/log/test.log +38 -0
  3. data/test/dummy/tmp/cache/assets/C29/E80/sprockets%2F8f076727207424919c7170c7157bbe37 +0 -0
  4. data/test/dummy/tmp/cache/assets/D04/3C0/sprockets%2F29d763bd40cc25622b1f04b876a5c3e3 +0 -0
  5. data/test/dummy/tmp/cache/assets/D3F/FA0/sprockets%2F22c8366fdbaaa2872b202dfe7376629f +0 -0
  6. data/test/dummy/tmp/cache/assets/D7C/3E0/sprockets%2F53c81ab87ec56a748428a59da9a5d5de +0 -0
  7. data/test/dummy/tmp/cache/assets/E3A/D90/sprockets%2Fce0dbefdb4416ebc42589ecdbf7d7857 +0 -0
  8. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_mixins.scssc +0 -0
  9. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_navbar.scssc +0 -0
  10. data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss +9 -9
  11. data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss +1 -1
  12. metadata +10 -10
data/lib/bootstrap/sass/rails/version.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  module Bootstrap
2
2
  module Sass
3
3
  module Rails
4
- VERSION = '2.0.2.0'
4
+ VERSION = '2.0.2.1'
5
5
  end
6
6
  end
7
7
  end
data/test/dummy/log/test.log CHANGED
@@ -1243,3 +1243,41 @@ Compiled twitter/bootstrap.css (559ms) (pid 9855)
1243
1243
  Compiled sprockets.css (567ms) (pid 9855)
1244
1244
  Compiled twitter/bootstrap.css (574ms) (pid 9855)
1245
1245
  Compiled sprockets.css (581ms) (pid 9855)
1246
+ Compiled application.css (738ms) (pid 90375)
1247
+ Compiled application.css (511ms) (pid 90375)
1248
+ Compiled application.css (522ms) (pid 90375)
1249
+ Compiled twitter/bootstrap/transition.js (0ms) (pid 90375)
1250
+ Compiled twitter/bootstrap/alert.js (0ms) (pid 90375)
1251
+ Compiled twitter/bootstrap/button.js (0ms) (pid 90375)
1252
+ Compiled twitter/bootstrap/carousel.js (0ms) (pid 90375)
1253
+ Compiled twitter/bootstrap/collapse.js (0ms) (pid 90375)
1254
+ Compiled twitter/bootstrap/dropdown.js (0ms) (pid 90375)
1255
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 90375)
1256
+ Compiled twitter/bootstrap/tooltip.js (0ms) (pid 90375)
1257
+ Compiled twitter/bootstrap/popover.js (0ms) (pid 90375)
1258
+ Compiled twitter/bootstrap/scrollspy.js (0ms) (pid 90375)
1259
+ Compiled twitter/bootstrap/tab.js (0ms) (pid 90375)
1260
+ Compiled twitter/bootstrap/typeahead.js (0ms) (pid 90375)
1261
+ Compiled twitter/bootstrap.js (98ms) (pid 90375)
1262
+ Compiled application.js (124ms) (pid 90375)
1263
+ Compiled twitter/bootstrap/transition.js (0ms) (pid 90375)
1264
+ Compiled twitter/bootstrap/alert.js (0ms) (pid 90375)
1265
+ Compiled twitter/bootstrap/button.js (0ms) (pid 90375)
1266
+ Compiled twitter/bootstrap/carousel.js (0ms) (pid 90375)
1267
+ Compiled twitter/bootstrap/collapse.js (0ms) (pid 90375)
1268
+ Compiled twitter/bootstrap/dropdown.js (0ms) (pid 90375)
1269
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 90375)
1270
+ Compiled twitter/bootstrap/tooltip.js (0ms) (pid 90375)
1271
+ Compiled twitter/bootstrap/popover.js (0ms) (pid 90375)
1272
+ Compiled twitter/bootstrap/scrollspy.js (0ms) (pid 90375)
1273
+ Compiled twitter/bootstrap/tab.js (0ms) (pid 90375)
1274
+ Compiled twitter/bootstrap/typeahead.js (0ms) (pid 90375)
1275
+ Compiled twitter/bootstrap.js (80ms) (pid 90375)
1276
+ Compiled application.js (86ms) (pid 90375)
1277
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 90375)
1278
+ Compiled individual.js (6ms) (pid 90375)
1279
+ Compiled individual.css (123ms) (pid 90375)
1280
+ Compiled twitter/bootstrap.css (584ms) (pid 90375)
1281
+ Compiled sprockets.css (591ms) (pid 90375)
1282
+ Compiled twitter/bootstrap.css (559ms) (pid 90375)
1283
+ Compiled sprockets.css (590ms) (pid 90375)
data/vendor/assets/stylesheets/twitter/bootstrap/_mixins.scss CHANGED
@@ -505,11 +505,11 @@
505
505
  }
506
506
 
507
507
  // The Grid
508
- @mixin grid-core-offset($columns) {
508
+ @mixin grid-core-offset($gridColumnWidth, $gridGutterWidth, $columns) {
509
509
  margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1)) + ($gridGutterWidth * 2);
510
510
  }
511
511
 
512
- @mixin grid-core-span($columns) {
512
+ @mixin grid-core-span($gridColumnWidth, $gridGutterWidth, $columns) {
513
513
  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
514
514
  }
515
515
 
@@ -527,16 +527,16 @@
527
527
  // Set the container width, and override it for fixed navbars in media queries
528
528
  .container,
529
529
  .navbar-fixed-top .container,
530
- .navbar-fixed-bottom .container { @include grid-core-span($gridColumns); }
530
+ .navbar-fixed-bottom .container { @include grid-core-span($gridColumnWidth, $gridGutterWidth, $gridColumns); }
531
531
 
532
532
  // generate .spanX and .offsetX
533
533
  @for $index from 1 through $gridColumns {
534
- .span#{$index} { @include grid-core-span($index) }
535
- .offset#{$index} { @include grid-core-offset($index) }
534
+ .span#{$index} { @include grid-core-span($gridColumnWidth, $gridGutterWidth, $index) }
535
+ .offset#{$index} { @include grid-core-offset($gridColumnWidth, $gridGutterWidth, $index) }
536
536
  }
537
537
  }
538
538
 
539
- @mixin grid-fluid-span($columns) {
539
+ @mixin grid-fluid-span($gridColumnWidth, $gridGutterWidth, $columns) {
540
540
  width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
541
541
  }
542
542
 
@@ -554,12 +554,12 @@
554
554
 
555
555
  // generate .spanX
556
556
  @for $index from 1 through $gridColumns {
557
- > .span#{$index} { @include grid-fluid-span($index); }
557
+ > .span#{$index} { @include grid-fluid-span($gridColumnWidth, $gridGutterWidth, $index); }
558
558
  }
559
559
  }
560
560
  }
561
561
 
562
- @mixin grid-input-span($columns) {
562
+ @mixin grid-input-span($gridColumnWidth, $gridGutterWidth, $columns) {
563
563
  width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 10;
564
564
  }
565
565
  @mixin grid-input($gridColumnWidth, $gridGutterWidth) {
@@ -574,7 +574,7 @@
574
574
  input.span#{$index},
575
575
  textarea.span#{$index},
576
576
  .uneditable-input.span#{$index} {
577
- @include grid-input-span($index);
577
+ @include grid-input-span($gridColumnWidth, $gridGutterWidth, $index);
578
578
  }
579
579
  }
580
580
  }
data/vendor/assets/stylesheets/twitter/bootstrap/_navbar.scss CHANGED
@@ -181,7 +181,7 @@
181
181
 
182
182
  .navbar-fixed-top .container,
183
183
  .navbar-fixed-bottom .container {
184
- @include grid-core-span($gridColumns);
184
+ @include grid-core-span($gridColumnWidth, $gridGutterWidth, $gridColumns);
185
185
  }
186
186
 
187
187
  // Fixed to top
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bootstrap-sass-rails
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.2.0
4
+ version: 2.0.2.1
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-03-13 00:00:00.000000000 Z
12
+ date: 2012-03-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70152550514080 !ruby/object:Gem::Requirement
16
+ requirement: &70313336630920 !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: *70152550514080
24
+ version_requirements: *70313336630920
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass-rails
27
- requirement: &70152550513480 !ruby/object:Gem::Requirement
27
+ requirement: &70313336629580 !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: *70152550513480
35
+ version_requirements: *70313336629580
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70152550513000 !ruby/object:Gem::Requirement
38
+ requirement: &70313336629120 !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: *70152550513000
46
+ version_requirements: *70313336629120
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.
@@ -220,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
220
220
  version: '0'
221
221
  segments:
222
222
  - 0
223
- hash: 630178751143479804
223
+ hash: -3446989779704171088
224
224
  required_rubygems_version: !ruby/object:Gem::Requirement
225
225
  none: false
226
226
  requirements:
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
229
229
  version: '0'
230
230
  segments:
231
231
  - 0
232
- hash: 630178751143479804
232
+ hash: -3446989779704171088
233
233
  requirements: []
234
234
  rubyforge_project:
235
235
  rubygems_version: 1.8.17