Merge branch 'master' into touch-this

This commit is contained in:
Mu-An Chiou 2020-04-24 09:53:43 -04:00
commit c0d811e24c
No known key found for this signature in database
GPG key ID: CD0B1EEC7A35239E
12 changed files with 1320 additions and 1160 deletions

18
.editorconfig Normal file
View file

@ -0,0 +1,18 @@
# https://editorconfig.org
root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 2
indent_style = space
insert_final_newline = true
max_line_length = 80
trim_trailing_whitespace = true
[*.md]
max_line_length = 0
trim_trailing_whitespace = false
[COMMIT_EDITMSG]
max_line_length = 0

View file

@ -1,3 +0,0 @@
language: node_js
node_js:
- 12

View file

@ -51,16 +51,19 @@ function buildDocs() {
function buildCSS() { function buildCSS() {
return postcss() return postcss()
.use(require("postcss-inline-svg")) .use(require("postcss-inline-svg"))
.use(require("postcss-css-variables")({ preserve: "computed" })) .use(require("postcss-css-variables"))
.use(require("postcss-calc")) .use(require("postcss-calc"))
.use(require("postcss-copy")({ dest: "build", template: "[name].[ext]" })) .use(require("postcss-copy")({ dest: "build", template: "[name].[ext]" }))
.use(require("cssnano"))
.process(fs.readFileSync("style.css"), { .process(fs.readFileSync("style.css"), {
from: "style.css", from: "style.css",
to: "build/98.css", to: "build/98.css",
map: { inline: false },
}) })
.then((result) => { .then((result) => {
mkdirp.sync("build"); mkdirp.sync("build");
fs.writeFileSync("build/98.css", result.css); fs.writeFileSync("build/98.css", result.css);
fs.writeFileSync("build/98.css.map", result.map);
}); });
} }

File diff suppressed because one or more lines are too long

1
build/98.css.map Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

1
docs/98.css.map Normal file

File diff suppressed because one or more lines are too long

View file

@ -1,7 +1,7 @@
body { body {
margin: 0; margin: 0;
padding: 0; padding: 0;
background: var(--surface); background: #c0c0c0;
} }
main { main {
@ -52,6 +52,10 @@ h2 {
margin-bottom: 12px; margin-bottom: 12px;
} }
h3 {
font-size: 1.6rem;
}
h3, h3,
h4 { h4 {
/* Swap the margin for a top-padding so linking to this section /* Swap the margin for a top-padding so linking to this section
@ -75,7 +79,7 @@ p {
blockquote { blockquote {
margin: 0 0 20px; margin: 0 0 20px;
padding: 20px; padding: 20px;
background: var(--button-face); background: #dfdfdf;
} }
blockquote footer { blockquote footer {
@ -85,7 +89,7 @@ blockquote footer {
.example { .example {
margin: 16px 0; margin: 16px 0;
padding: 12px 24px; padding: 12px 24px;
border-left: 1px solid var(--button-shadow); border-left: 1px solid #808080;
} }
details { details {
@ -108,7 +112,8 @@ button.focused {
} }
button.active { button.active {
box-shadow: var(--border-sunken-outer), var(--border-sunken-inner); box-shadow: inset -1px -1px #ffffff, inset 1px 1px #0a0a0a,
inset -2px -2px #dfdfdf, inset 2px 2px #808080;
} }
@media (max-width: 480px) { @media (max-width: 480px) {

1268
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -1,13 +1,12 @@
{ {
"name": "98.css", "name": "98.css",
"version": "0.1.4", "version": "0.1.5",
"description": "A design system for building faithful recreations of old UIs", "description": "A design system for building faithful recreations of old UIs",
"main": "build/98.css", "main": "build/98.css",
"directories": { "directories": {
"doc": "docs" "doc": "docs"
}, },
"scripts": { "scripts": {
"test": "sh test.sh",
"build": "node build.js" "build": "node build.js"
}, },
"repository": { "repository": {
@ -25,6 +24,7 @@
}, },
"homepage": "https://github.com/jdan/98.css#readme", "homepage": "https://github.com/jdan/98.css#readme",
"devDependencies": { "devDependencies": {
"cssnano": "^4.1.10",
"dedent": "^0.7.0", "dedent": "^0.7.0",
"ejs": "^3.0.2", "ejs": "^3.0.2",
"glob": "^7.1.6", "glob": "^7.1.6",

View file

@ -144,6 +144,10 @@ button:focus {
outline-offset: -4px; outline-offset: -4px;
} }
button::-moz-focus-inner {
border: 0;
}
:disabled, :disabled,
:disabled + label { :disabled + label {
color: var(--button-shadow); color: var(--button-shadow);
@ -260,6 +264,7 @@ input[type="checkbox"] {
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
margin: 0; margin: 0;
background: 0; /* necessary for hiding default disabled-state styling on iOS */
border: none; border: none;
} }
@ -348,6 +353,8 @@ input[type="checkbox"][disabled]:checked + label::after {
} }
input[type="text"], input[type="text"],
input[type="password"],
input[type="email"],
select, select,
textarea { textarea {
padding: 3px 4px; padding: 3px 4px;
@ -362,11 +369,15 @@ textarea {
} }
input[type="text"], input[type="text"],
input[type="password"],
input[type="email"],
select { select {
height: 21px; height: 21px;
} }
input[type="text"] { input[type="text"],
input[type="password"],
input[type="email"] {
/* For some reason descenders are getting cut off without this */ /* For some reason descenders are getting cut off without this */
line-height: 2; line-height: 2;
} }
@ -385,6 +396,8 @@ select {
select:focus, select:focus,
input[type="text"]:focus, input[type="text"]:focus,
input[type="password"]:focus,
input[type="email"]:focus,
textarea:focus { textarea:focus {
outline: none; outline: none;
} }

12
test.sh
View file

@ -1,12 +0,0 @@
#!/bin/sh
npm run build
output=$( git diff build docs )
if [ -z "$output" ]
then
break
else
echo "Please commit the latest build of 98.css (git commit)"
exit 1;
fi