diff --git a/.gitignore b/.gitignore index 6a8e1de..0bf779f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ npm-debug.log .sass-cache/ /dist/ -src/components/ \ No newline at end of file +src/components/ +.idea/ \ No newline at end of file diff --git a/README.md b/README.md index 54909fe..039d5c3 100644 --- a/README.md +++ b/README.md @@ -25,16 +25,25 @@ $ npm run grunt ### CSS importing -##### Recommended (A): Add Mossflower as a Bower dependency +##### Recommended (A): Add Mossflower as an NPM package ``` -$ bower install --save mossflower +$ npm install --save mossflower ``` -##### Recommended (B): Add Mossflower as a package +If you add Mossflower as an NPM package, then it will default to the `.less` version if you are using commonJS modules +```javascript +// ECMAScript 5 +require('mossflower'); +// ES6 +import 'mossflower'; ``` -$ npm install --save mossflower + +##### Recommended (B): Add Mossflower as a Bower dependency + +``` +$ bower install --save mossflower ``` ##### Alternative: Add Mossflower as a submodule diff --git a/bower.json b/bower.json index c096bb6..e7d7def 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "mossflower", - "version": "0.2.8", + "version": "0.2.9", "authors": [ { "name": "Jimmy Ha", diff --git a/package.json b/package.json index 883ce01..e3a2135 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mossflower", - "version": "0.2.8", + "version": "0.2.9", "description": "Mossflower is a global reset CSS utility for both LESS and SASS", "main": "src/less/mossflower.less", "scripts": { diff --git a/src/less/globals.less b/src/less/globals.less index 2017d67..f95e153 100644 --- a/src/less/globals.less +++ b/src/less/globals.less @@ -47,6 +47,11 @@ a { &:hover { text-decoration: underline; } + // typically text tags are given a defined color somewhere else, which will + // then be overridden if they are children of links + span { + color: inherit; + } } img { diff --git a/src/sass/_globals.scss b/src/sass/_globals.scss index 20c7548..55279ef 100644 --- a/src/sass/_globals.scss +++ b/src/sass/_globals.scss @@ -48,6 +48,11 @@ a { &:hover { text-decoration: underline; } + // typically text tags are given a defined color somewhere else, which will + // then be overridden if they are children of links + span { + color: inherit; + } } img {