Code
/
pressbooks-aldine
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Normalize color scheme (fix #52)

pull/79/head
Ned Zimmerman 7 years ago
parent
9fc027ffd7
commit
04bbb9c33c
No known key found for this signature in database
GPG Key ID: FF56334A013120CA
8 changed files with 77 additions and 80 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      assets/styles/components/_forms.scss
  2. 4
      assets/styles/layouts/_page-catalog.scss
  3. 2
      assets/styles/layouts/_page-home.scss
  4. 4
      dist/mix-manifest.json
  5. 2
      dist/styles/aldine.css
  6. 2
      dist/styles/editor.css
  7. 125
      package.json
  8. 6
      yarn.lock

12
assets/styles/components/_forms.scss
Unescape View File

@ -16,7 +16,7 @@ textarea {
border-top: 0;
border-right: 0;
border-left: 0;
border-bottom: solid 2px var(--black, #000);
border-bottom: solid 2px var(--body-text);
border-radius: 0;
padding: 0 0 1.5em;
font-size: 1rem;
@ -52,11 +52,11 @@ input[type="submit"] {
text-align: center;
&--error {
color: var(--error, #c00);
color: var(--error);
}
&--success {
color: var(--success, #070);
color: var(--success);
}
}
@ -89,10 +89,10 @@ input[type="submit"] {
}
}
&.error {
border-bottom: solid 2px #c00;
border-bottom: solid 2px var(--error);
+ label {
color: #c00;
color: var(--error);
}
}
}
@ -112,7 +112,7 @@ input[type="submit"] {
align-items: center;
width: 100%;
padding: rem(65) 0 rem(120);
background: #f6f6f6;
background: var(--body-bg-alt);
h2 {
margin-bottom: rem(40);

4
assets/styles/layouts/_page-catalog.scss
Unescape View File

@ -55,7 +55,7 @@ fieldset {
h2 {
[aria-expanded="true"] {
border-bottom: solid 2px var(--accent);
background: #fafdff;
background: var(--body-bg-alt);
}
}
@ -145,7 +145,7 @@ fieldset {
font-family: $font-family-sans-serif;
a {
color: #000;
color: var(--body-text);
&:hover,
&:focus {

2
assets/styles/layouts/_page-home.scss
Unescape View File

@ -56,7 +56,7 @@
margin-top: 0;
path {
fill: var(--primary, $brand);
fill: var(--primary);
}
}
}

4
dist/mix-manifest.json vendored
Unescape View File

@ -1,7 +1,7 @@
{
"/scripts/aldine.js": "/scripts/aldine.js?id=1f58027f7de9942caf57",
"/styles/aldine.css": "/styles/aldine.css?id=aa47048cd3a38bde8f17",
"/styles/editor.css": "/styles/editor.css?id=d96762ab5918cde0c2e1",
"/styles/aldine.css": "/styles/aldine.css?id=c201ad8990b4d397c721",
"/styles/editor.css": "/styles/editor.css?id=57b43072488bc84dff89",
"/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53",
"/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=d25f1240496bd3607338"
}

2
dist/styles/aldine.css vendored
View File

File diff suppressed because one or more lines are too long

2
dist/styles/editor.css vendored
View File

File diff suppressed because one or more lines are too long

125
package.json
Unescape View File

@ -1,66 +1,63 @@
{
"name": "@pressbooks/pressbooks-aldine",
"version": "1.0.0-beta.2",
"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
"homepage": "https://github.com/pressbooks/pressbooks-aldine/",
"description": "Aldine is the root theme for Pressbooks.",
"keywords": [
"publishing",
"catalog",
"pressbooks",
"default-theme"
],
"private": true,
"repository": {
"type": "git",
"url": "git://github.com/pressbooks/pressbooks-aldine.git"
},
"bugs": {
"url": "https://github.com/pressbooks/pressbooks-aldine/issues"
},
"licenses": [
{
"type": "GPL-3.0",
"url": "https://opensource.org/licenses/GPL-3.0"
}
],
"browserslist": [
"last 2 versions",
"android 4",
"opera 12"
],
"eslintConfig": {
"extends": "./node_modules/pressbooks-build-tools/config/eslint.js",
"globals": {
"$": true,
"PB_A11y": true
}
},
"stylelint": {
"extends": "./node_modules/pressbooks-build-tools/config/stylelint.js"
},
"scripts": {
"build": "cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"build:production": "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",
"lint": "npm run -s lint:scripts && npm run -s lint:styles",
"lint:scripts": "cross-env NODE_ENV=development node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"",
"lint:styles": "cross-env NODE_ENV=development node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss",
"test": "npm run -s lint"
},
"engines": {
"node": ">= 6.9.4"
},
"devDependencies": {
"pressbooks-build-tools": "^0.10.0"
},
"dependencies": {
"aetna": "^1.0.0-alpha.3",
"isotope-layout": "^3.0.5",
"jquery-bridget": "^2.0.1",
"js-cookie": "^2.2.0",
"wpapi": "^1.1.2"
}
"name": "@pressbooks/pressbooks-aldine",
"version": "1.0.0-beta.2",
"author": "Pressbooks (Book Oven Inc.) <code@pressbooks.com>",
"homepage": "https://github.com/pressbooks/pressbooks-aldine/",
"description": "Aldine is the root theme for Pressbooks.",
"keywords": ["publishing", "catalog", "pressbooks", "default-theme"],
"private": true,
"repository": {
"type": "git",
"url": "git://github.com/pressbooks/pressbooks-aldine.git"
},
"bugs": {
"url": "https://github.com/pressbooks/pressbooks-aldine/issues"
},
"licenses": [
{
"type": "GPL-3.0",
"url": "https://opensource.org/licenses/GPL-3.0"
}
],
"browserslist": ["last 2 versions", "android 4", "opera 12"],
"eslintConfig": {
"extends": "./node_modules/pressbooks-build-tools/config/eslint.js",
"globals": {
"$": true,
"PB_A11y": true
}
},
"stylelint": {
"extends": "./node_modules/pressbooks-build-tools/config/stylelint.js"
},
"scripts": {
"build":
"cross-env NODE_ENV=development webpack --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
"build:production":
"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",
"lint": "npm run -s lint:scripts && npm run -s lint:styles",
"lint:scripts":
"cross-env NODE_ENV=development node_modules/eslint/bin/eslint.js \"assets/scripts/*.js\"",
"lint:styles":
"cross-env NODE_ENV=development node_modules/stylelint/bin/stylelint.js \"assets/styles/**/*.scss\" --syntax scss",
"test": "npm run -s lint"
},
"engines": {
"node": ">= 6.9.4"
},
"devDependencies": {
"pressbooks-build-tools": "^0.10.0"
},
"dependencies": {
"aetna": "^1.0.0-alpha.6",
"isotope-layout": "^3.0.5",
"jquery-bridget": "^2.0.1",
"js-cookie": "^2.2.0",
"wpapi": "^1.1.2"
}
}

6
yarn.lock
Unescape View File

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

Write Preview
Loading…
Cancel
Save