Browse Source

Fix #63.

pull/75/head
Ned Zimmerman 7 years ago
parent
commit
a730fe2eed
No known key found for this signature in database
GPG Key ID: FF56334A013120CA
  1. 2
      assets/styles/components/_forms.scss
  2. 2
      dist/mix-manifest.json
  3. 2
      dist/styles/aldine.css
  4. 30
      package.json
  5. 6
      yarn.lock

2
assets/styles/components/_forms.scss

@ -16,7 +16,7 @@ textarea {
border-top: 0; border-top: 0;
border-right: 0; border-right: 0;
border-left: 0; border-left: 0;
border-bottom: solid 2px var(--black); border-bottom: solid 2px var(--black, #000);
border-radius: 0; border-radius: 0;
padding: 0 0 1.5em; padding: 0 0 1.5em;
font-size: 1rem; font-size: 1rem;

2
dist/mix-manifest.json vendored

@ -1,6 +1,6 @@
{ {
"/scripts/aldine.js": "/scripts/aldine.js?id=1f58027f7de9942caf57", "/scripts/aldine.js": "/scripts/aldine.js?id=1f58027f7de9942caf57",
"/styles/aldine.css": "/styles/aldine.css?id=fa7bbb302e39b92990db", "/styles/aldine.css": "/styles/aldine.css?id=23585277fc9935ca45bb",
"/styles/editor.css": "/styles/editor.css?id=d96762ab5918cde0c2e1", "/styles/editor.css": "/styles/editor.css?id=d96762ab5918cde0c2e1",
"/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53", "/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53",
"/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=d25f1240496bd3607338" "/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=d25f1240496bd3607338"

2
dist/styles/aldine.css vendored

File diff suppressed because one or more lines are too long

30
package.json

@ -4,12 +4,7 @@
"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>", "author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
"homepage": "https://github.com/pressbooks/pressbooks-aldine/", "homepage": "https://github.com/pressbooks/pressbooks-aldine/",
"description": "Aldine is the root theme for Pressbooks.", "description": "Aldine is the root theme for Pressbooks.",
"keywords": [ "keywords": ["publishing", "catalog", "pressbooks", "default-theme"],
"publishing",
"catalog",
"pressbooks",
"default-theme"
],
"private": true, "private": true,
"repository": { "repository": {
"type": "git", "type": "git",
@ -24,11 +19,7 @@
"url": "https://opensource.org/licenses/GPL-3.0" "url": "https://opensource.org/licenses/GPL-3.0"
} }
], ],
"browserslist": [ "browserslist": ["last 2 versions", "android 4", "opera 12"],
"last 2 versions",
"android 4",
"opera 12"
],
"eslintConfig": { "eslintConfig": {
"extends": "./node_modules/pressbooks-build-tools/config/eslint.js", "extends": "./node_modules/pressbooks-build-tools/config/eslint.js",
"globals": { "globals": {
@ -40,14 +31,19 @@
"extends": "./node_modules/pressbooks-build-tools/config/stylelint.js" "extends": "./node_modules/pressbooks-build-tools/config/stylelint.js"
}, },
"scripts": { "scripts": {
"build": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "build":
"build:production": "cross-env NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"build:profile": "cross-env NODE_ENV=production webpack --progress --profile --json --config=node_modules/laravel-mix/setup/webpack.config.js", "build:production":
"start": "cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js", "cross-env NODE_ENV=production webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"build:profile":
"cross-env NODE_ENV=production webpack --progress --profile --json --config=node_modules/laravel-mix/setup/webpack.config.js",
"start":
"cross-env NODE_ENV=development webpack --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"rmdist": "rimraf dist", "rmdist": "rimraf dist",
"lint": "npm run -s lint:scripts && npm run -s lint:styles", "lint": "npm run -s lint:scripts && npm run -s lint:styles",
"lint:scripts": "node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"", "lint:scripts": "node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"",
"lint:styles": "node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss", "lint:styles":
"node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss",
"test": "npm run -s lint" "test": "npm run -s lint"
}, },
"engines": { "engines": {
@ -57,7 +53,7 @@
"pressbooks-build-tools": "^0.10.0" "pressbooks-build-tools": "^0.10.0"
}, },
"dependencies": { "dependencies": {
"aetna": "^1.0.0-alpha.1", "aetna": "^1.0.0-alpha.3",
"isotope-layout": "^3.0.5", "isotope-layout": "^3.0.5",
"jquery-bridget": "^2.0.1", "jquery-bridget": "^2.0.1",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",

6
yarn.lock

@ -178,9 +178,9 @@ adjust-sourcemap-loader@^1.1.0:
object-path "^0.9.2" object-path "^0.9.2"
regex-parser "^2.2.1" regex-parser "^2.2.1"
aetna@^1.0.0-alpha.1: aetna@^1.0.0-alpha.3:
version "1.0.0-alpha.1" version "1.0.0-alpha.3"
resolved "https://registry.yarnpkg.com/aetna/-/aetna-1.0.0-alpha.1.tgz#0c9954a6797f89d7ddb0bc56f9a420b07dc667e1" resolved "https://registry.yarnpkg.com/aetna/-/aetna-1.0.0-alpha.3.tgz#c520d4a0f66ff13829e54d8ef123de43bf469b35"
dependencies: dependencies:
"@frctl/fractal" "^1.1.7" "@frctl/fractal" "^1.1.7"

Loading…
Cancel
Save