normalize-scss 2.1.3 → 2.2.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/README.md +3 -1
  4. data/_normalize.scss +21 -21
  5. data/bower.json +24 -20
  6. data/component.json +2 -2
  7. data/normalize-scss.gemspec +4 -3
  8. metadata +26 -12
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 808bb7e2473d93ecf0b7159c02b4e4a563f67e9c
4
- data.tar.gz: 61b37ae0bb0650a7e2eec7c1927595407810fb3c
3
+ metadata.gz: ee004151ff6570f4a7ba69fe75c99112c83d5bef
4
+ data.tar.gz: 58d665a65ff0ef7bf4a5afdb7d00659549b0517d
5
5
  SHA512:
6
- metadata.gz: ccc683a851238ece4c6689dca5b8562442730dad75058df7c12fb92dcf94859b411fcfe83dcb9edf3540808ae6fcbbe4f4062576765d5c2bb682b5c077f89c9f
7
- data.tar.gz: aada08ee4f7b19e69578f7a42ceb541f0e100943bc99f75a50997e5658c744ecd90d51b179cc56a495038f47d5992b3ae6820077bb36397438294e8c21c45dc7
6
+ metadata.gz: f855024df27bb8781e989e9e1aaebbdaa5ce410976a76b45a619c859f368388fc0b6882c3e36266d7726e7beb452fc22b4b84dfa513d88c6d2199de5ba014ff3
7
+ data.tar.gz: ed074b517e0f82536ca296742c6ae0f61a64ddf175c4cb66c5f5b57aaabdbf5cc6401a212b283dbe90b0fe0dd1743cb96ebf348daa4d87aa007fdbc672e68cbb
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  === HEAD
2
2
 
3
+ === 2.2.0+normalize.2.1.3 (January 22, 2014)
4
+
5
+ * Font size of "code, kbd, pre, samp" should always be 1em relative to parent.
6
+
3
7
  === 2.1.3 (August 26, 2013)
4
8
 
5
9
  * Fix component.json.
data/README.md CHANGED
@@ -1,6 +1,6 @@
1
1
  ## Latest downloadable version
2
2
 
3
- The latest release of _normalize.scss is: [2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/archive/2.1.3.zip).
3
+ The latest release of _normalize.scss is: [2.2.0+normalize.2.1.3](https://github.com/JohnAlbin/normalize.css-with-sass-or-compass/releases/tag/2.2.0%2Bnormalize.2.1.3).
4
4
  It combines normalize.css v2.1.3 and normalize v1.1.3.
5
5
 
6
6
  ## The Compass port of normalize.css
@@ -111,3 +111,5 @@ Including:
111
111
  Some of the above projects convert normalize into Sass mixins. That makes it
112
112
  impossible to add Normalize using __Approach 1__ (by copying the file into your website
113
113
  and customizing/overriding for your needs.)
114
+
115
+ [![Build Status](https://travis-ci.org/JohnAlbin/normalize.css-with-sass-or-compass.png?branch=master)](https://travis-ci.org/JohnAlbin/normalize.css-with-sass-or-compass)
data/_normalize.scss CHANGED
@@ -1,26 +1,37 @@
1
- /* normalize.css v2.1.3 | MIT License | git.io/normalize */
2
- /* normalize.scss v2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
1
+ /* normalize.scss 2.2.0+normalize.2.1.3 | MIT/GPLv2 License | bit.ly/normalize-with-compass */
3
2
 
4
3
 
5
4
  // =============================================================================
6
5
  // Variables and Imports
7
6
  //
8
7
  // If you have a base partial (or equivalent), you should move these lines to
9
- // that file. @see http://compass-style.org/help/tutorials/best_practices/
8
+ // that file. NOTE: Edit the lines to remove "!default".
9
+ // @see http://compass-style.org/help/tutorials/best_practices/
10
10
  // =============================================================================
11
11
 
12
+ // These 2 variables are copies of ones used in Compass' Vertical Rhythm module.
13
+
14
+ // The base font size.
15
+ $base-font-size: 16px !default;
16
+
17
+ // The base line height determines the basic unit of vertical rhythm.
18
+ $base-line-height: 24px !default;
19
+
20
+ // These 2 variables are copies of ones used in Compass' support module.
21
+
22
+ // Set this to true to add support for IE 6.
23
+ $legacy-support-for-ie6: false !default;
24
+
25
+ // Set this to true to add support for IE 7.
26
+ $legacy-support-for-ie7: false !default;
27
+
28
+
12
29
  // Set this to true to force CSS output to exactly match normalize.css.
13
30
  $strict-normalize: true !default;
14
31
 
15
32
  // The default font family.
16
33
  $base-font-family: sans-serif !default;
17
34
 
18
- // The base font size.
19
- $base-font-size: 16px !default; // Override default set in Compass' Vertical Rhythm partial.
20
-
21
- // The base line height determines the basic unit of vertical rhythm.
22
- $base-line-height: 24px !default; // Override default set in Compass' Vertical Rhythm partial.
23
-
24
35
  // The font sizes for h1-h6.
25
36
  $h1-font-size: 2 * $base-font-size !default;
26
37
  $h2-font-size: 1.5 * $base-font-size !default;
@@ -32,12 +43,6 @@ $h6-font-size: 0.67 * $base-font-size !default;
32
43
  // The amount lists and blockquotes are indented.
33
44
  $indent-amount: 40px !default;
34
45
 
35
- // Set this to true to add support for IE 6.
36
- $legacy-support-for-ie6: false !default; // Override default set in Compass' Support partial.
37
-
38
- // Set this to true to add support for IE 7.
39
- $legacy-support-for-ie7: false !default; // Override default set in Compass' Support partial.
40
-
41
46
  // After the default variables are set, import the required Compass partials.
42
47
  @import "compass/support";
43
48
  @import "compass/css3/box-sizing";
@@ -304,12 +309,7 @@ samp {
304
309
  @if $legacy-support-for-ie6 {
305
310
  _font-family: 'courier new', monospace;
306
311
  }
307
- @if $strict-normalize {
308
- font-size: 1em;
309
- }
310
- @else {
311
- @include adjust-font-size-to( $base-font-size );
312
- }
312
+ font-size: 1em;
313
313
  }
314
314
 
315
315
  /**
data/bower.json CHANGED
@@ -1,22 +1,26 @@
1
1
  {
2
- "name": "normalize-scss",
3
- "version": "2.1.3",
4
- "main": "_normalize.scss",
5
- "author": ["Nicolas Gallagher", "John Albin Wilkins"],
6
- "ignore": [
7
- "CHANGELOG.md",
8
- "CONTRIBUTING.md",
9
- "component.json",
10
- "normalize-scss.gemspec",
11
- "lib/normalize-scss.rb",
12
- "test.html"
13
- ],
14
- "licenses": [{
15
- "type": "MIT",
16
- "url": "http://opensource.org/licenses/MIT"
17
- },
18
- {
19
- "type": "GPLv2",
20
- "url": "http://www.gnu.org/licenses/gpl-2.0.html"
21
- }]
2
+ "name": "normalize-scss",
3
+ "version": "2.2.0+normalize.2.1.3",
4
+ "homepage": "https://github.com/JohnAlbin/normalize.css-with-sass-or-compass",
5
+ "authors": [
6
+ "Nicolas Gallagher",
7
+ "John Albin Wilkins"
8
+ ],
9
+ "description": "A Sass/Compass version of Normalize.css.",
10
+ "main": "_normalize.scss",
11
+ "keywords": [
12
+ "normalize.css"
13
+ ],
14
+ "license": [
15
+ "MIT",
16
+ "GPLv2"
17
+ ],
18
+ "ignore": [
19
+ "CHANGELOG.md",
20
+ "CONTRIBUTING.md",
21
+ "component.json",
22
+ "normalize-scss.gemspec",
23
+ "lib/normalize-scss.rb",
24
+ "test.html"
25
+ ]
22
26
  }
data/component.json CHANGED
@@ -1,8 +1,8 @@
1
1
  {
2
2
  "name": "normalize-scss",
3
3
  "repo": "JohnAlbin/normalize.css-with-sass-or-compass",
4
- "description": "A Sass/Compass version of Normalize.css. This port tracks the parent project very closely.",
5
- "version": "2.1.3",
4
+ "description": "A Sass/Compass version of Normalize.css.",
5
+ "version": "2.2.0+normalize.2.1.3",
6
6
  "styles": ["_normalize.scss"],
7
7
  "author": ["Nicolas Gallagher", "John Albin Wilkins"],
8
8
  "license": "GPLv2"
data/normalize-scss.gemspec CHANGED
@@ -9,14 +9,15 @@ Gem::Specification.new do |s|
9
9
  s.homepage = 'https://github.com/JohnAlbin/normalize.css-with-sass-or-compass'
10
10
  s.rubyforge_project =
11
11
 
12
- s.version = '2.1.3'
13
- s.date = '2013-11-03'
12
+ s.version = '2.2.0'
13
+ s.date = '2014-01-22'
14
14
  s.licenses = ['GPL-2']
15
15
 
16
16
  s.authors = ['John Albin Wilkins']
17
17
  s.email = 'virtually.johnalbin@gmail.com'
18
18
 
19
- s.add_runtime_dependency('sass', ">= 3.2")
19
+ s.add_runtime_dependency('sass', "~> 3.2.0")
20
+ s.add_runtime_dependency('compass', "~> 0.12.0")
20
21
 
21
22
  s.files = %w[
22
23
  _normalize.scss
metadata CHANGED
@@ -1,29 +1,43 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: normalize-scss
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.3
4
+ version: 2.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - John Albin Wilkins
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-03 00:00:00.000000000 Z
11
+ date: 2014-01-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sass
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - '>='
17
+ - - ~>
18
18
  - !ruby/object:Gem::Version
19
- version: '3.2'
19
+ version: 3.2.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - '>='
24
+ - - ~>
25
25
  - !ruby/object:Gem::Version
26
- version: '3.2'
26
+ version: 3.2.0
27
+ - !ruby/object:Gem::Dependency
28
+ name: compass
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: 0.12.0
34
+ type: :runtime
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
39
+ - !ruby/object:Gem::Version
40
+ version: 0.12.0
27
41
  description: A Sass/Compass version of Normalize.css. This port tracks the parent
28
42
  project very closely.
29
43
  email: virtually.johnalbin@gmail.com
@@ -31,15 +45,15 @@ executables: []
31
45
  extensions: []
32
46
  extra_rdoc_files: []
33
47
  files:
48
+ - CHANGELOG.md
49
+ - CONTRIBUTING.md
50
+ - LICENSE.md
51
+ - README.md
34
52
  - _normalize.scss
35
53
  - bower.json
36
- - CHANGELOG.md
37
54
  - component.json
38
- - CONTRIBUTING.md
39
55
  - lib/normalize-scss.rb
40
- - LICENSE.md
41
56
  - normalize-scss.gemspec
42
- - README.md
43
57
  - test.html
44
58
  homepage: https://github.com/JohnAlbin/normalize.css-with-sass-or-compass
45
59
  licenses:
@@ -60,8 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
60
74
  - !ruby/object:Gem::Version
61
75
  version: '0'
62
76
  requirements: []
63
- rubyforge_project: 2.1.3
64
- rubygems_version: 2.1.10
77
+ rubyforge_project: 2.2.0
78
+ rubygems_version: 2.2.0
65
79
  signing_key:
66
80
  specification_version: 4
67
81
  summary: A Sass/Compass version of Normalize.css