Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/JohnAlbin/normalize-scss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnAlbin <virtually.johnalbin@gmail.com>2016-10-17 18:16:28 +0300
committerJohnAlbin <virtually.johnalbin@gmail.com>2016-10-17 18:28:10 +0300
commit4d034c66bd6a7f34781a25feadd88dd53e646539 (patch)
tree10db836ebee437385be0612bf87a083f09006252
parentc46438f272c0ed6c083436ff32301838225d5611 (diff)
Remove support for IE6-7 and Firefox 29 from Typey fork. #89
-rw-r--r--fork-versions/typey/README.md15
-rw-r--r--fork-versions/typey/_normalize.scss62
-rw-r--r--fork-versions/typey/_variables.scss6
-rw-r--r--test/fixtures/fork-versions/typey/output.css11
-rw-r--r--test/test_fork-versions.js1
5 files changed, 6 insertions, 89 deletions
diff --git a/fork-versions/typey/README.md b/fork-versions/typey/README.md
index 9c368a9..526e73b 100644
--- a/fork-versions/typey/README.md
+++ b/fork-versions/typey/README.md
@@ -3,13 +3,13 @@
## Using with node-sass
1. Copy these files to your Sass project.
-2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module and the [typey](https://github.com/jptaranto/typey) Sass module. Add it to your package.json with:
+2. This fork-able version requires the [typey](https://github.com/jptaranto/typey) Sass module. Add it to your package.json with:
```bash
-npm install --save-dev support-for typey
+npm install --save-dev typey
```
-3. Add support-for's `sass` directory to your nodeSass' [`includePaths` option](https://github.com/sass/node-sass#includepaths).
+3. Add Typey's Sass directory to your nodeSass' [`includePaths` option](https://github.com/sass/node-sass#includepaths).
```js
var sass = require('node-sass'),
@@ -18,7 +18,6 @@ var sass = require('node-sass'),
sass.render({
file: scss_filename,
includePaths: [
- path.dirname(require.resolve('support-for')),
path.dirname(require.resolve('typey'))
]
}, function(err, result) { /*...*/ });
@@ -26,10 +25,10 @@ sass.render({
## Using with libSass
-If you are not using node-sass with libSass, you probably already know how to include 3rd party libraries into your Sass project.
+If you are using libSass but not using node-sass, you probably already know how to include 3rd party libraries into your Sass project.
1. Copy these files to your Sass project.
-2. This fork-able version requires the [support-for](https://github.com/JohnAlbin/support-for) Sass module and the [typey](https://github.com/jptaranto/typey) Sass module. Add support-for's `sass` directory and typey's `stylesheets` directory to your libSass include paths in the "usual way".
+2. This fork-able version requires the [typey](https://github.com/jptaranto/typey) Sass module. Add typey's `stylesheets` directory to your libSass include paths in the "usual way".
## Using with Ruby Sass
@@ -38,14 +37,12 @@ In addition to copying these files to your Sass project, you'll also need to:
1. Edit your `Gemfile` file to add:
```ruby
-gem 'support-for', '~> 1.0'
-gem 'typey', '~> 1.0.0.beta.7'
+gem 'typey', '~> 1.0.0'
```
2. If you use Compass, edit your `config.rb` file to add:
```ruby
-require 'support-for'
require 'typey'
```
diff --git a/fork-versions/typey/_normalize.scss b/fork-versions/typey/_normalize.scss
index 2b8d2b5..d206427 100644
--- a/fork-versions/typey/_normalize.scss
+++ b/fork-versions/typey/_normalize.scss
@@ -1,7 +1,6 @@
/*! normalize-scss | MIT/GPLv2 License | bit.ly/normalize-scss */
@import 'variables';
-@import 'support-for';
@import 'typey';
/**
@@ -59,10 +58,6 @@ canvas,
progress,
video {
display: inline-block;
- @if support-for(ie, 7) {
- *display: inline;
- *zoom: 1;
- }
}
/**
@@ -157,9 +152,6 @@ code,
kbd,
samp {
font-family: monospace, monospace; /* 1 */
- @if support-for(ie, 6) {
- _font-family: 'courier new', monospace;
- }
font-size: 1em; /* 2 */
}
@@ -255,10 +247,6 @@ sup {
img {
border-style: none;
- @if support-for(ie, 7) {
- /* Improve image quality when scaled in IE 7. */
- -ms-interpolation-mode: bicubic;
- }
}
/**
@@ -280,10 +268,6 @@ blockquote {
@include margin(1 $indent-amount);
}
-/**
- * Address margins set differently in IE 6/7.
- */
-
dl,
menu,
ol,
@@ -307,28 +291,12 @@ dd {
margin: 0 0 0 $indent-amount;
}
-/**
- * Address paddings set differently in IE 6/7.
- */
-
menu,
ol,
ul {
padding: 0 0 0 $indent-amount;
}
-@if support-for(ie, 7) {
- /**
- * Correct list images handled incorrectly in IE 7.
- */
-
- nav ul,
- nav ol {
- list-style: none;
- list-style-image: none;
- }
-}
-
/**
* Add the correct margin in IE 8.
*/
@@ -384,21 +352,9 @@ pre {
* on when it has padding (and textfield appearance).
*/
-@if support-for(ie, 7) {
- /**
- * Correct margin displayed oddly in IE 6/7.
- */
-
- form {
- margin: 0;
- }
-}
-
/**
* 1. Change font properties to `inherit` in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
- * 3. Address `font-family` inconsistency between `textarea` and other form in IE 7
- * 4. Improve appearance and consistency with IE 6/7.
*/
button,
@@ -408,10 +364,6 @@ select,
textarea {
font: inherit; /* 1 */
margin: 0; /* 2 */
- @if support-for(ie, 7) {
- *font-family: $base-font-family; /* 3 */
- *vertical-align: middle; /* 4 */
- }
}
/**
@@ -474,27 +426,17 @@ button,
input {
overflow: visible;
- @if support-for(firefox, 29) {
- // Firefox sets `line-height` using `!important` in the UA stylesheet.
- line-height: normal;
- }
}
/**
* 1. Add the correct box sizing in IE <11.
* 2. Remove the padding in IE <11.
- * 3. Remove excess padding in IE 7.
- * Known issue: excess padding remains in IE 6.
*/
[type="checkbox"],
[type="radio"] {
box-sizing: border-box; /* 1 */
padding: 0; /* 2 */
- @if support-for(ie, 7) {
- *height: 13px; /* 3 */
- *width: 13px; /* 3 */
- }
}
/**
@@ -560,7 +502,6 @@ fieldset {
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
- * 4. Correct alignment displayed oddly in IE 6/7.
*/
legend {
@@ -570,9 +511,6 @@ legend {
white-space: normal; /* 1 */
color: inherit; /* 2 */
padding: 0; /* 3 */
- @if support-for(ie, 7) {
- *margin-left: -7px; /* 4 */
- }
}
/**
diff --git a/fork-versions/typey/_variables.scss b/fork-versions/typey/_variables.scss
index 4c0250c..5a14afa 100644
--- a/fork-versions/typey/_variables.scss
+++ b/fork-versions/typey/_variables.scss
@@ -4,12 +4,6 @@
// If you have an initialization partial (or equivalent), you should move these
// lines to that file.
-// Support the same browsers as normalize.css v3.
-$support-for: (
- ie: 9, // IE 9-11
- '*': -4, // The last 4 versions of all other browsers.
-) !default;
-
// The font size set on the root html element.
$base-font-size: 16px !default;
diff --git a/test/fixtures/fork-versions/typey/output.css b/test/fixtures/fork-versions/typey/output.css
index 2d034d6..35c8cdc 100644
--- a/test/fixtures/fork-versions/typey/output.css
+++ b/test/fixtures/fork-versions/typey/output.css
@@ -227,9 +227,6 @@ svg:not(:root) {
blockquote {
margin: 1.5rem 2.5rem; }
-/**
- * Address margins set differently in IE 6/7.
- */
dl,
menu,
ol,
@@ -248,9 +245,6 @@ ul ul {
dd {
margin: 0 0 0 40px; }
-/**
- * Address paddings set differently in IE 6/7.
- */
menu,
ol,
ul {
@@ -305,8 +299,6 @@ pre {
/**
* 1. Change font properties to `inherit` in all browsers (opinionated).
* 2. Remove the margin in Firefox and Safari.
- * 3. Address `font-family` inconsistency between `textarea` and other form in IE 7
- * 4. Improve appearance and consistency with IE 6/7.
*/
button,
input,
@@ -376,8 +368,6 @@ input {
/**
* 1. Add the correct box sizing in IE <11.
* 2. Remove the padding in IE <11.
- * 3. Remove excess padding in IE 7.
- * Known issue: excess padding remains in IE 6.
*/
[type="checkbox"],
[type="radio"] {
@@ -438,7 +428,6 @@ fieldset {
* 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
- * 4. Correct alignment displayed oddly in IE 6/7.
*/
legend {
box-sizing: border-box;
diff --git a/test/test_fork-versions.js b/test/test_fork-versions.js
index b5248c1..79678d0 100644
--- a/test/test_fork-versions.js
+++ b/test/test_fork-versions.js
@@ -35,7 +35,6 @@ describe('Fork versions', function() {
// Path to Fork version.
path.join(__dirname, '../fork-versions/typey'),
// Path to normalize-scss' dependencies.
- path.dirname(require.resolve('support-for')),
path.dirname(require.resolve('typey'))
]
});