From 0993a693a3fffc916b67d20b4c7921fd48a03277 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:16:59 +0800 Subject: [PATCH 1/8] replaces scss with plain css file --- reset.scss => reset.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) rename reset.scss => reset.css (89%) diff --git a/reset.scss b/reset.css similarity index 89% rename from reset.scss rename to reset.css index 52d954e..ae7b052 100644 --- a/reset.scss +++ b/reset.css @@ -75,11 +75,11 @@ strong { a { text-decoration: none; - - // remove border on IE - img { - border: none; - } +} + +// remove border on IE +a img { + border: none; } button, From 3a953fe5d9f3c64bfa293c460a22a285e25a19ac Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:18:00 +0800 Subject: [PATCH 2/8] remove bower and update readme --- README.md | 21 +++++++++------------ bower.json | 19 ------------------- 2 files changed, 9 insertions(+), 31 deletions(-) delete mode 100644 bower.json diff --git a/README.md b/README.md index cfa2d33..11c034f 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,23 @@ These are simple reset styles to get started on your next frontend project. It uses ideas from all major resets stylesheets like [Eric Meyers Reset](http://meyerweb.com/eric/tools/css/reset/) and [html5doctor.com Reset Stylesheet](http://html5doctor.com/html-5-reset-stylesheet/), but just includes the absolute necessary styles. ## Package Manager -The package is available on [Bower](https://bower.io/) and [npm](https://www.npmjs.com/). +The package is available [npm](https://www.npmjs.com/). -### NPM -Add package to your package.json file by typing this command into your terminal: +Add the package to your package.json file by typing this command into your terminal: + +#### NPM ``` npm install miux-reset --save ``` -... or add the following line inside 'dependencies'to your package.json: -``` -"miux-reset": "^1.0.0" -``` -### Bower -Add package to your bower.json file by typing this command into your terminal: +#### Yarn ``` -bower install miux-reset --save +yarn add miux-reset ``` -... or add the following line inside 'dependencies'to your bower.json: + +... or add the following line inside 'dependencies'to your package.json: ``` -"miux-reset": "^1.0.0" +"miux-reset": "^2.0.0" ``` ## Contributor diff --git a/bower.json b/bower.json deleted file mode 100644 index 1ddd3ab..0000000 --- a/bower.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "miux-reset", - "description": "Simple reset styles", - "main": "reset.scss", - "authors": [ - "Andrew Jelley (https://jelley.fish)", - "Marc Wieland (https://marcwieland.name)" - ], - "license": "ISC", - "keywords": [ - "reset", - "scss", - "style", - "lightweight", - "simple", - "kiss" - ], - "homepage": "http://miux.ch" -} From 17e6a487358f8450fb50189e60f34a8d0b19f795 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:19:01 +0800 Subject: [PATCH 3/8] use css instead of scss in `package.json` --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index abf426a..e630b30 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,8 @@ "name": "miux-reset", "version": "1.0.0", "description": "Simple reset styles", - "main": "reset.scss", + "main": "reset.css", + "style": "reset.css", "scripts": { "test": "echo \"Error: no test specified\" && exit 1" }, From b6be6ac9291dd9ab5397bf719d8a5a25881d89ac Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:19:39 +0800 Subject: [PATCH 4/8] Create new major version because of a breaking change --- README.md | 4 ++++ package.json | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 11c034f..26fa1c7 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ yarn add miux-reset "miux-reset": "^2.0.0" ``` +## Version +1.0.0 - Reset styles based on SCSS +2.0.0 - Plain CSS file for easy import and usage everywhere, stripped bower support + ## Contributor [Miux](http://miux.ch) is a small agency in Chur, the eastern part of Switzerland. diff --git a/package.json b/package.json index e630b30..a67407d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "miux-reset", - "version": "1.0.0", + "version": "2.0.0", "description": "Simple reset styles", "main": "reset.css", "style": "reset.css", @@ -14,6 +14,7 @@ "keywords": [ "reset", "scss", + "css", "style", "lightweight", "simple", @@ -24,8 +25,6 @@ "Marc Wieland (https://marcwieland.name)" ], "license": "ISC", - "bugs": { - "url": "https://github.com/miux/reset/issues" - }, - "homepage": "http://miux.ch" + "bugs": "https://github.com/miux/reset/issues", + "homepage": "https://miux.ch" } From 65ee346fdcdac2c1602922d17b8c02c6a3f53e39 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:23:35 +0800 Subject: [PATCH 5/8] Small changes in chore files --- README.md | 8 ++++++-- package.json | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 26fa1c7..974244a 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,12 @@ yarn add miux-reset ``` ## Version -1.0.0 - Reset styles based on SCSS -2.0.0 - Plain CSS file for easy import and usage everywhere, stripped bower support +### 1.0.0 +- Reset styles based on SCSS + +### 2.0.0 +- Plain CSS file for easy import and usage everywhere +- Stripped bower support ## Contributor [Miux](http://miux.ch) is a small agency in Chur, the eastern part of Switzerland. diff --git a/package.json b/package.json index a67407d..097f5c7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "miux-reset", "version": "2.0.0", - "description": "Simple reset styles", + "description": "Simple reset styles based on plain CSS", "main": "reset.css", "style": "reset.css", "scripts": { From 157e4c64d1c5a14daeea397e672a18d647bb4471 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Mon, 21 Oct 2019 10:49:27 +0800 Subject: [PATCH 6/8] Remove comments and improve CS --- reset.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/reset.css b/reset.css index ae7b052..d2d92b7 100644 --- a/reset.css +++ b/reset.css @@ -17,11 +17,9 @@ html { overflow-y: scroll; font-size: 100%; line-height: 1.25; - color: rgb(0, 0, 0); + color: rgb(0,0,0); text-size-adjust: none; text-rendering: optimizeLegibility; - //-webkit-font-smoothing: antialiased; - //-moz-osx-font-smoothing: grayscale; } body { @@ -77,7 +75,7 @@ a { text-decoration: none; } -// remove border on IE +/* remove border on IE */ a img { border: none; } From 46f5eb53984e1af504ae23e237996aa649ac5641 Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Fri, 3 Jan 2020 11:23:55 +0100 Subject: [PATCH 7/8] add readme section for usage with react or scss --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 974244a..633eba3 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,23 @@ yarn add miux-reset "miux-reset": "^2.0.0" ``` +## Usage +### SCSS/CSS +``` +import '../../node_modules/miux-reset/reset.css'; +/* other imports and more styles */ +``` + +### Styled Components (React) +``` +import miuxReset from "miux-reset"; + +const GlobalStyle = createGlobalStyle` + ${miuxReset} + /* other styles */ +`; +``` + ## Version ### 1.0.0 - Reset styles based on SCSS From 1d72efbb6601a9716737669763e68cb597fcbd5f Mon Sep 17 00:00:00 2001 From: Marc Wieland Date: Sat, 4 Jan 2020 09:46:07 +0100 Subject: [PATCH 8/8] add height properties to html and body --- reset.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/reset.css b/reset.css index d2d92b7..42b1c28 100644 --- a/reset.css +++ b/reset.css @@ -13,6 +13,7 @@ html, body { } html { + height: 100%; box-sizing: border-box; overflow-y: scroll; font-size: 100%; @@ -23,6 +24,7 @@ html { } body { + min-height: 100%; font-variant-ligatures: no-common-ligatures; }