From e207120f570c2aea30c69a7839a16e6623d80f00 Mon Sep 17 00:00:00 2001 From: Fabian Date: Tue, 13 Aug 2019 21:10:36 +0200 Subject: [PATCH] Changing font-size behaviour --- package-lock.json | 28 +++++++++++++++++++--------- package.json | 2 +- src/base/_global.scss | 4 ++-- 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index de6f396..fab2896 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@hibas123/theme", - "version": "1.1.0", + "version": "1.2.4", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -47,7 +47,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true + "dev": true, + "optional": true }, "asynckit": { "version": "0.4.0", @@ -126,6 +127,7 @@ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, + "optional": true, "requires": { "delayed-stream": "~1.0.0" } @@ -151,7 +153,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", - "dev": true + "dev": true, + "optional": true }, "ecc-jsbn": { "version": "0.1.2", @@ -185,7 +188,8 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true + "dev": true, + "optional": true }, "fast-deep-equal": { "version": "2.0.1", @@ -340,7 +344,8 @@ "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true + "dev": true, + "optional": true }, "json-schema": { "version": "0.2.3", @@ -404,13 +409,15 @@ "version": "1.40.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==", - "dev": true + "dev": true, + "optional": true }, "mime-types": { "version": "2.1.24", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", "dev": true, + "optional": true, "requires": { "mime-db": "1.40.0" } @@ -535,13 +542,15 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "optional": true }, "sass": { "version": "1.22.7", @@ -618,7 +627,8 @@ "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true + "dev": true, + "optional": true }, "uri-js": { "version": "4.2.2", diff --git a/package.json b/package.json index 5131219..f8a7610 100644 --- a/package.json +++ b/package.json @@ -21,4 +21,4 @@ "dependencies": { "sass": "^1.22.7" } -} \ No newline at end of file +} diff --git a/src/base/_global.scss b/src/base/_global.scss index ca64dff..be957f8 100644 --- a/src/base/_global.scss +++ b/src/base/_global.scss @@ -1,7 +1,5 @@ * { box-sizing: border-box; - font-family: 'Roboto', sans-serif; - font-size: 1rem; } html, @@ -9,6 +7,8 @@ body { margin: 0; min-height: 100vh; min-width: 100%; + font-size: 1rem; + font-family: 'Roboto', sans-serif; } .margin {