From ca94efb734ca8b9068c83055502dff22128dc76f Mon Sep 17 00:00:00 2001
From: dthill <dthill@gmx.net>
Date: Wed, 3 Jul 2019 10:38:19 +0200
Subject: [PATCH 1/2] add styled-normalize to BodyStyles
---
package-lock.json | 5 +++++
package.json | 3 ++-
src/lib/styles/BodyStyles.js | 4 +++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 80f254c..3bfb28d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19571,6 +19571,11 @@
}
}
},
+ "styled-normalize": {
+ "version": "8.0.6",
+ "resolved": "https://registry.npmjs.org/styled-normalize/-/styled-normalize-8.0.6.tgz",
+ "integrity": "sha512-tOnAD1+wV04aiVy6chaQA4u/EtkGiGZPlIBYvEfWlZQBrDqRhu9EdPyXlFzLWxpOmANoQelJqSOMlV3QNCDKkw=="
+ },
"stylehacks": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
diff --git a/package.json b/package.json
index bfb5393..acdb8d8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,8 @@
"version": "0.10.0",
"main": "dist/ui-atoms.js",
"dependencies": {
- "react-studs": "^2.1.0"
+ "react-studs": "^2.1.0",
+ "styled-normalize": "^8.0.6"
},
"scripts": {
"prepublishOnly": "npm run build:prod",
diff --git a/src/lib/styles/BodyStyles.js b/src/lib/styles/BodyStyles.js
index f3b069c..9402401 100644
--- a/src/lib/styles/BodyStyles.js
+++ b/src/lib/styles/BodyStyles.js
@@ -1,5 +1,6 @@
import { createGlobalStyle } from 'styled-components'
import { theme } from '../inittheme'
+import styledNormalize from 'styled-normalize'
const body = theme
.register('body', t => ({
@@ -8,6 +9,8 @@ const body = theme
.createSelector()
const BodyStyles = createGlobalStyle`
+ ${styledNormalize}
+
html {
font-size: 20px;
}
@@ -18,5 +21,4 @@ const BodyStyles = createGlobalStyle`
background-color: ${body('background')};
}
`
-
export default BodyStyles
--
GitLab
From 9ed2a71fa101952d307ee25abea96932a8807b80 Mon Sep 17 00:00:00 2001
From: dthill <dthill@gmx.net>
Date: Wed, 3 Jul 2019 13:42:09 +0200
Subject: [PATCH 2/2] remove styled-normalize dependency, use normalize as text
import
---
package-lock.json | 5 -
package.json | 3 +-
src/lib/styles/BodyStyles.js | 5 +-
src/lib/styles/normalize.js | 353 +++++++++++++++++++++++++++++++++++
4 files changed, 356 insertions(+), 10 deletions(-)
create mode 100644 src/lib/styles/normalize.js
diff --git a/package-lock.json b/package-lock.json
index 3bfb28d..80f254c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19571,11 +19571,6 @@
}
}
},
- "styled-normalize": {
- "version": "8.0.6",
- "resolved": "https://registry.npmjs.org/styled-normalize/-/styled-normalize-8.0.6.tgz",
- "integrity": "sha512-tOnAD1+wV04aiVy6chaQA4u/EtkGiGZPlIBYvEfWlZQBrDqRhu9EdPyXlFzLWxpOmANoQelJqSOMlV3QNCDKkw=="
- },
"stylehacks": {
"version": "4.0.3",
"resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz",
diff --git a/package.json b/package.json
index acdb8d8..bfb5393 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,7 @@
"version": "0.10.0",
"main": "dist/ui-atoms.js",
"dependencies": {
- "react-studs": "^2.1.0",
- "styled-normalize": "^8.0.6"
+ "react-studs": "^2.1.0"
},
"scripts": {
"prepublishOnly": "npm run build:prod",
diff --git a/src/lib/styles/BodyStyles.js b/src/lib/styles/BodyStyles.js
index 9402401..6d74781 100644
--- a/src/lib/styles/BodyStyles.js
+++ b/src/lib/styles/BodyStyles.js
@@ -1,6 +1,6 @@
import { createGlobalStyle } from 'styled-components'
import { theme } from '../inittheme'
-import styledNormalize from 'styled-normalize'
+import normalize from './normalize'
const body = theme
.register('body', t => ({
@@ -9,8 +9,7 @@ const body = theme
.createSelector()
const BodyStyles = createGlobalStyle`
- ${styledNormalize}
-
+ ${normalize}
html {
font-size: 20px;
}
diff --git a/src/lib/styles/normalize.js b/src/lib/styles/normalize.js
new file mode 100644
index 0000000..f41b93a
--- /dev/null
+++ b/src/lib/styles/normalize.js
@@ -0,0 +1,353 @@
+const normalize = `
+/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
+
+/* Document
+ ========================================================================== */
+
+/**
+ * 1. Correct the line height in all browsers.
+ * 2. Prevent adjustments of font size after orientation changes in iOS.
+ */
+
+html {
+ line-height: 1.15; /* 1 */
+ -webkit-text-size-adjust: 100%; /* 2 */
+}
+
+/* Sections
+ ========================================================================== */
+
+/**
+ * Remove the margin in all browsers.
+ */
+
+body {
+ margin: 0;
+}
+
+/**
+ * Render the 'main' element consistently in IE.
+ */
+
+main {
+ display: block;
+}
+
+/**
+ * Correct the font size and margin on 'h1' elements within 'section' and
+ * 'article' contexts in Chrome, Firefox, and Safari.
+ */
+
+h1 {
+ font-size: 2em;
+ margin: 0.67em 0;
+}
+
+/* Grouping content
+ ========================================================================== */
+
+/**
+ * 1. Add the correct box sizing in Firefox.
+ * 2. Show the overflow in Edge and IE.
+ */
+
+hr {
+ box-sizing: content-box; /* 1 */
+ height: 0; /* 1 */
+ overflow: visible; /* 2 */
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd 'em' font sizing in all browsers.
+ */
+
+pre {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/* Text-level semantics
+ ========================================================================== */
+
+/**
+ * Remove the gray background on active links in IE 10.
+ */
+
+a {
+ background-color: transparent;
+}
+
+/**
+ * 1. Remove the bottom border in Chrome 57-
+ * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
+ */
+
+abbr[title] {
+ border-bottom: none; /* 1 */
+ text-decoration: underline; /* 2 */
+ text-decoration: underline dotted; /* 2 */
+}
+
+/**
+ * Add the correct font weight in Chrome, Edge, and Safari.
+ */
+
+b,
+strong {
+ font-weight: bolder;
+}
+
+/**
+ * 1. Correct the inheritance and scaling of font size in all browsers.
+ * 2. Correct the odd 'em' font sizing in all browsers.
+ */
+
+code,
+kbd,
+samp {
+ font-family: monospace, monospace; /* 1 */
+ font-size: 1em; /* 2 */
+}
+
+/**
+ * Add the correct font size in all browsers.
+ */
+
+small {
+ font-size: 80%;
+}
+
+/**
+ * Prevent 'sub' and 'sup' elements from affecting the line height in
+ * all browsers.
+ */
+
+sub,
+sup {
+ font-size: 75%;
+ line-height: 0;
+ position: relative;
+ vertical-align: baseline;
+}
+
+sub {
+ bottom: -0.25em;
+}
+
+sup {
+ top: -0.5em;
+}
+
+/* Embedded content
+ ========================================================================== */
+
+/**
+ * Remove the border on images inside links in IE 10.
+ */
+
+img {
+ border-style: none;
+}
+
+/* Forms
+ ========================================================================== */
+
+/**
+ * 1. Change the font styles in all browsers.
+ * 2. Remove the margin in Firefox and Safari.
+ */
+
+button,
+input,
+optgroup,
+select,
+textarea {
+ font-family: inherit; /* 1 */
+ font-size: 100%; /* 1 */
+ line-height: 1.15; /* 1 */
+ margin: 0; /* 2 */
+}
+
+/**
+ * Show the overflow in IE.
+ * 1. Show the overflow in Edge.
+ */
+
+button,
+input { /* 1 */
+ overflow: visible;
+}
+
+/**
+ * Remove the inheritance of text transform in Edge, Firefox, and IE.
+ * 1. Remove the inheritance of text transform in Firefox.
+ */
+
+button,
+select { /* 1 */
+ text-transform: none;
+}
+
+/**
+ * Correct the inability to style clickable types in iOS and Safari.
+ */
+
+button,
+[type="button"],
+[type="reset"],
+[type="submit"] {
+ -webkit-appearance: button;
+}
+
+/**
+ * Remove the inner border and padding in Firefox.
+ */
+
+button::-moz-focus-inner,
+[type="button"]::-moz-focus-inner,
+[type="reset"]::-moz-focus-inner,
+[type="submit"]::-moz-focus-inner {
+ border-style: none;
+ padding: 0;
+}
+
+/**
+ * Restore the focus styles unset by the previous rule.
+ */
+
+button:-moz-focusring,
+[type="button"]:-moz-focusring,
+[type="reset"]:-moz-focusring,
+[type="submit"]:-moz-focusring {
+ outline: 1px dotted ButtonText;
+}
+
+/**
+ * Correct the padding in Firefox.
+ */
+
+fieldset {
+ padding: 0.35em 0.75em 0.625em;
+}
+
+/**
+ * 1. Correct the text wrapping in Edge and IE.
+ * 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.
+ */
+
+legend {
+ box-sizing: border-box; /* 1 */
+ color: inherit; /* 2 */
+ display: table; /* 1 */
+ max-width: 100%; /* 1 */
+ padding: 0; /* 3 */
+ white-space: normal; /* 1 */
+}
+
+/**
+ * Add the correct vertical alignment in Chrome, Firefox, and Opera.
+ */
+
+progress {
+ vertical-align: baseline;
+}
+
+/**
+ * Remove the default vertical scrollbar in IE 10+.
+ */
+
+textarea {
+ overflow: auto;
+}
+
+/**
+ * 1. Add the correct box sizing in IE 10.
+ * 2. Remove the padding in IE 10.
+ */
+
+[type="checkbox"],
+[type="radio"] {
+ box-sizing: border-box; /* 1 */
+ padding: 0; /* 2 */
+}
+
+/**
+ * Correct the cursor style of increment and decrement buttons in Chrome.
+ */
+
+[type="number"]::-webkit-inner-spin-button,
+[type="number"]::-webkit-outer-spin-button {
+ height: auto;
+}
+
+/**
+ * 1. Correct the odd appearance in Chrome and Safari.
+ * 2. Correct the outline style in Safari.
+ */
+
+[type="search"] {
+ -webkit-appearance: textfield; /* 1 */
+ outline-offset: -2px; /* 2 */
+}
+
+/**
+ * Remove the inner padding in Chrome and Safari on macOS.
+ */
+
+[type="search"]::-webkit-search-decoration {
+ -webkit-appearance: none;
+}
+
+/**
+ * 1. Correct the inability to style clickable types in iOS and Safari.
+ * 2. Change font properties to 'inherit' in Safari.
+ */
+
+::-webkit-file-upload-button {
+ -webkit-appearance: button; /* 1 */
+ font: inherit; /* 2 */
+}
+
+/* Interactive
+ ========================================================================== */
+
+/*
+ * Add the correct display in Edge, IE 10+, and Firefox.
+ */
+
+details {
+ display: block;
+}
+
+/*
+ * Add the correct display in all browsers.
+ */
+
+summary {
+ display: list-item;
+}
+
+/* Misc
+ ========================================================================== */
+
+/**
+ * Add the correct display in IE 10+.
+ */
+
+template {
+ display: none;
+}
+
+/**
+ * Add the correct display in IE 10.
+ */
+
+[hidden] {
+ display: none;
+}
+`
+
+export default normalize
--
GitLab