bootstrap-sass-rails 2.0.3.0pre1 → 2.0.3.0pre2

Sign up to get free protection for your applications and to get access to all the features.
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/_forms.scssc +0 -0
  9. data/test/dummy/tmp/cache/sass/367107abe8cc7204b7df467455e0644864892d9f/_labels-badges.scssc +0 -0
  10. data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss +1 -2
  11. data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss +11 -12
  12. metadata +9 -9
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.3.0pre1'
4
+ VERSION = '2.0.3.0pre2'
5
5
  end
6
6
  end
7
7
  end
data/test/dummy/log/test.log CHANGED
@@ -1891,3 +1891,41 @@ Compiled twitter/bootstrap.css (603ms) (pid 9468)
1891
1891
  Compiled sprockets.css (610ms) (pid 9468)
1892
1892
  Compiled twitter/bootstrap.css (591ms) (pid 9468)
1893
1893
  Compiled sprockets.css (598ms) (pid 9468)
1894
+ Compiled application.css (741ms) (pid 51620)
1895
+ Compiled application.css (589ms) (pid 51620)
1896
+ Compiled application.css (565ms) (pid 51620)
1897
+ Compiled twitter/bootstrap/transition.js (0ms) (pid 51620)
1898
+ Compiled twitter/bootstrap/alert.js (0ms) (pid 51620)
1899
+ Compiled twitter/bootstrap/button.js (0ms) (pid 51620)
1900
+ Compiled twitter/bootstrap/carousel.js (0ms) (pid 51620)
1901
+ Compiled twitter/bootstrap/collapse.js (0ms) (pid 51620)
1902
+ Compiled twitter/bootstrap/dropdown.js (0ms) (pid 51620)
1903
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 51620)
1904
+ Compiled twitter/bootstrap/tooltip.js (0ms) (pid 51620)
1905
+ Compiled twitter/bootstrap/popover.js (0ms) (pid 51620)
1906
+ Compiled twitter/bootstrap/scrollspy.js (0ms) (pid 51620)
1907
+ Compiled twitter/bootstrap/tab.js (0ms) (pid 51620)
1908
+ Compiled twitter/bootstrap/typeahead.js (0ms) (pid 51620)
1909
+ Compiled twitter/bootstrap.js (111ms) (pid 51620)
1910
+ Compiled application.js (138ms) (pid 51620)
1911
+ Compiled twitter/bootstrap/transition.js (0ms) (pid 51620)
1912
+ Compiled twitter/bootstrap/alert.js (0ms) (pid 51620)
1913
+ Compiled twitter/bootstrap/button.js (0ms) (pid 51620)
1914
+ Compiled twitter/bootstrap/carousel.js (0ms) (pid 51620)
1915
+ Compiled twitter/bootstrap/collapse.js (0ms) (pid 51620)
1916
+ Compiled twitter/bootstrap/dropdown.js (0ms) (pid 51620)
1917
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 51620)
1918
+ Compiled twitter/bootstrap/tooltip.js (0ms) (pid 51620)
1919
+ Compiled twitter/bootstrap/popover.js (0ms) (pid 51620)
1920
+ Compiled twitter/bootstrap/scrollspy.js (0ms) (pid 51620)
1921
+ Compiled twitter/bootstrap/tab.js (0ms) (pid 51620)
1922
+ Compiled twitter/bootstrap/typeahead.js (0ms) (pid 51620)
1923
+ Compiled twitter/bootstrap.js (83ms) (pid 51620)
1924
+ Compiled application.js (89ms) (pid 51620)
1925
+ Compiled twitter/bootstrap/modal.js (0ms) (pid 51620)
1926
+ Compiled individual.js (5ms) (pid 51620)
1927
+ Compiled individual.css (148ms) (pid 51620)
1928
+ Compiled twitter/bootstrap.css (621ms) (pid 51620)
1929
+ Compiled sprockets.css (629ms) (pid 51620)
1930
+ Compiled twitter/bootstrap.css (634ms) (pid 51620)
1931
+ Compiled sprockets.css (642ms) (pid 51620)
data/vendor/assets/stylesheets/twitter/bootstrap/_forms.scss CHANGED
@@ -48,8 +48,7 @@ input,
48
48
  button,
49
49
  select,
50
50
  textarea {
51
- // TODO: MOJ - check baseFontFamily
52
- @include font-sans-serif($baseFontSize,normal,$baseLineHeight); // And only set font-family here for those that need it (note the missing label element)
51
+ font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
53
52
  }
54
53
 
55
54
  // Identify controls by their labels
data/vendor/assets/stylesheets/twitter/bootstrap/_labels-badges.scss CHANGED
@@ -35,21 +35,20 @@ a {
35
35
 
36
36
  // Colors
37
37
  // Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
38
- .label,
39
- .badge {
38
+ @each $type in label, badge {
40
39
  // Important (red)
41
- &-important { background-color: $errorText; }
42
- &-important:hover { background-color: darken($errorText, 10%); }
40
+ .#{$type}-important { background-color: $errorText; }
41
+ .#{$type}-important:hover { background-color: darken($errorText, 10%); }
43
42
  // Warnings (orange)
44
- &-warning { background-color: $orange; }
45
- &-warning:hover { background-color: darken($orange, 10%); }
43
+ .#{$type}-warning { background-color: $orange; }
44
+ .#{$type}-warning:hover { background-color: darken($orange, 10%); }
46
45
  // Success (green)
47
- &-success { background-color: $successText; }
48
- &-success:hover { background-color: darken($successText, 10%); }
46
+ .#{$type}-success { background-color: $successText; }
47
+ .#{$type}-success:hover { background-color: darken($successText, 10%); }
49
48
  // Info (turquoise)
50
- &-info { background-color: $infoText; }
51
- &-info:hover { background-color: darken($infoText, 10%); }
49
+ .#{$type}-info { background-color: $infoText; }
50
+ .#{$type}-info:hover { background-color: darken($infoText, 10%); }
52
51
  // Inverse (black)
53
- &-inverse { background-color: $grayDark; }
54
- &-inverse:hover { background-color: darken($grayDark, 10%); }
52
+ .#{$type}-inverse { background-color: $grayDark; }
53
+ .#{$type}-inverse:hover { background-color: darken($grayDark, 10%); }
55
54
  }
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.3.0pre1
4
+ version: 2.0.3.0pre2
5
5
  prerelease: 7
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-04-24 00:00:00.000000000 Z
12
+ date: 2012-05-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70169854784000 !ruby/object:Gem::Requirement
16
+ requirement: &70349798814260 !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: *70169854784000
24
+ version_requirements: *70349798814260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: sass-rails
27
- requirement: &70169854783500 !ruby/object:Gem::Requirement
27
+ requirement: &70349798813760 !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: *70169854783500
35
+ version_requirements: *70349798813760
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70169854783040 !ruby/object:Gem::Requirement
38
+ requirement: &70349798813300 !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: *70169854783040
46
+ version_requirements: *70349798813300
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.
@@ -230,7 +230,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
230
230
  version: '0'
231
231
  segments:
232
232
  - 0
233
- hash: -2862996145594083021
233
+ hash: -2625903827196640663
234
234
  required_rubygems_version: !ruby/object:Gem::Requirement
235
235
  none: false
236
236
  requirements: