Skip to content

Commit

Permalink
modern-normalize is bundled to avoid potential --load-path conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Zaydek Michels-Gualtieri committed Nov 17, 2020
1 parent f89a68a commit f7a5588
Show file tree
Hide file tree
Showing 4 changed files with 311 additions and 12 deletions.
11 changes: 5 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zaydek/duomo",
"version": "0.6.7",
"version": "0.6.6",
"main": "dist/index.css",
"license": "MIT",
"files": [
Expand All @@ -9,10 +9,10 @@
"duomo.scss"
],
"scripts": {
"watch-consumer": "watch --interval 0.1 'yarn -s sass --load-path=node_modules/modern-normalize --no-charset src/consumer.scss dist/index.css' src",
"watch-duomo": "watch --interval 0.1 'yarn -s sass --load-path=node_modules/modern-normalize --no-charset src/duomo/index.scss dist/index.css' src",
"build-duomo": "sass --load-path=node_modules/modern-normalize --no-charset src/duomo/index.scss dist/index.css",
"build-reset": "sass --load-path=node_modules/modern-normalize --no-charset src/duomo/reset.scss dist/reset.css",
"watch-consumer": "watch --interval 0.1 'yarn -s sass --no-charset src/consumer.scss dist/index.css' src",
"watch-duomo": "watch --interval 0.1 'yarn -s sass --no-charset src/duomo/index.scss dist/index.css' src",
"build-duomo": "sass --no-charset src/duomo/index.scss dist/index.css",
"build-reset": "sass --no-charset src/duomo/reset.scss dist/reset.css",
"test": "jest",
"build": "rm -rf dist && yarn test && yarn tsc && yarn build-duomo && yarn build-reset",
"publish-dist-dry-run": "yarn build && npm publish --dry-run"
Expand All @@ -24,7 +24,6 @@
"@types/react": "^16.9.55",
"@types/sass": "^1.16.0",
"jest": "^26.6.3",
"modern-normalize": "^1.0.0",
"prettier": "^2.1.2",
"react": "^17.0.1",
"react-dom": "^17.0.1",
Expand Down
303 changes: 303 additions & 0 deletions src/duomo/preflight/modern-normalize.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,303 @@
// https://github.com/sindresorhus/modern-normalize/blob/master/modern-normalize.css
//
// prettier-ignore
@mixin modern-normalize {
/*! modern-normalize v1.0.0 | MIT License | https://github.com/sindresorhus/modern-normalize */

/*
Document
========
*/

/**
Use a better box model (opinionated).
*/

*,
*::before,
*::after {
box-sizing: border-box;
}

/**
Use a more readable tab size (opinionated).
*/

:root {
-moz-tab-size: 4;
tab-size: 4;
}

/**
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;
}

/**
Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
*/

body {
font-family:
system-ui,
-apple-system, /* Firefox supports this but not yet `system-ui` */
'Segoe UI',
Roboto,
Helvetica,
Arial,
sans-serif,
'Apple Color Emoji',
'Segoe UI Emoji';
}

/*
Grouping content
================
*/

/**
1. Add the correct height in Firefox.
2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655)
*/

hr {
height: 0; /* 1 */
color: inherit; /* 2 */
}

/*
Text-level semantics
====================
*/

/**
Add the correct text decoration in Chrome, Edge, and Safari.
*/

abbr[title] {
text-decoration: underline dotted;
}

/**
Add the correct font weight in Edge and Safari.
*/

b,
strong {
font-weight: bolder;
}

/**
1. Improve consistency of default fonts in all browsers. (https://github.com/sindresorhus/modern-normalize/issues/3)
2. Correct the odd 'em' font sizing in all browsers.
*/

code,
kbd,
samp,
pre {
font-family:
ui-monospace,
SFMono-Regular,
Consolas,
'Liberation Mono',
Menlo,
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;
}

/*
Tabular data
============
*/

/**
1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297)
2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016)
*/

table {
text-indent: 0; /* 1 */
border-color: inherit; /* 2 */
}

/*
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 */
}

/**
Remove the inheritance of text transform in Edge and Firefox.
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.
*/

::-moz-focus-inner {
border-style: none;
padding: 0;
}

/**
Restore the focus styles unset by the previous rule.
*/

:-moz-focusring {
outline: 1px dotted ButtonText;
}

/**
Remove the additional ':invalid' styles in Firefox.
See: https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737
*/

:-moz-ui-invalid {
box-shadow: none;
}

/**
Remove the padding so developers are not caught out when they zero out 'fieldset' elements in all browsers.
*/

legend {
padding: 0;
}

/**
Add the correct vertical alignment in Chrome and Firefox.
*/

progress {
vertical-align: baseline;
}

/**
Correct the cursor style of increment and decrement buttons in Safari.
*/

::-webkit-inner-spin-button,
::-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.
*/

::-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 Chrome and Safari.
*/

summary {
display: list-item;
}
}
4 changes: 3 additions & 1 deletion src/duomo/preflight/reset.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
@use "sass:meta";

@use "modern-normalize" as *;
@use "tailwind-base" as *;
@use "vendored-font-smoothing" as *;

@mixin reset {
@include meta.load-css("modern-normalize");
// @include meta.load-css("modern-normalize");
@include modern-normalize;
@include tailwind-base;
@include vendored-font-smoothing;
}
5 changes: 0 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3244,11 +3244,6 @@ mixin-deep@^1.2.0:
for-in "^1.0.2"
is-extendable "^1.0.1"

modern-normalize@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/modern-normalize/-/modern-normalize-1.0.0.tgz#539d84a1e141338b01b346f3e27396d0ed17601e"
integrity sha512-1lM+BMLGuDfsdwf3rsgBSrxJwAZHFIrQ8YR61xIqdHo0uNKI9M52wNpHSrliZATJp51On6JD0AfRxd4YGSU0lw==

ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
Expand Down

0 comments on commit f7a5588

Please sign in to comment.