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

Merge branch 'dev' into gutenberg 

# Conflicts:
#	dist/mix-manifest.json
#	package.json
pull/46/head
Ned Zimmerman 8 years ago
parent
b5ca0a4a25 2cd433995b
commit
01cfd50fc2
10 changed files with 80 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      assets/styles/aldine.scss
  2. 2
      assets/styles/components/_forms.scss
  3. 29
      assets/styles/layouts/_page-catalog.scss
  4. 42
      assets/styles/layouts/_signup.scss
  5. 19
      dist/mix-manifest.json
  6. 2
      dist/styles/aldine.css
  7. 8
      package-lock.json
  8. 4
      package.json
  9. 4
      page-catalog.php
  10. 6
      yarn.lock

1
assets/styles/aldine.scss
Unescape View File

@ -17,3 +17,4 @@
@import "layouts/page"; @import "layouts/page";
@import "layouts/page-home"; @import "layouts/page-home";
@import "layouts/page-catalog"; @import "layouts/page-catalog";
@import "layouts/signup";

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

@ -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;

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

@ -190,7 +190,7 @@ fieldset {
} }
} }
@media #{$breakpoint-tablet-and-up} { @media #{$breakpoint-medium} {
.filter-sort { .filter-sort {
width: calc(100% - 1rem); width: calc(100% - 1rem);
height: 7rem; height: 7rem;
@ -249,27 +249,18 @@ fieldset {
@media #{$breakpoint-large} { @media #{$breakpoint-large} {
.catalog #content { .catalog #content {
width: 100%; width: calc(100% - 1rem);
max-width: rem(1440); margin-left: auto;
background: transparent; margin-right: auto;
}
.catalog .book {
max-width: calc(100% / 3 - 1rem);
}
}
@media #{$breakpoint-extra-large} {
.catalog #content {
width: 100%;
max-width: rem(1650); max-width: rem(1650);
background: transparent;
} }
.filter-sort { .filter-sort {
width: calc(25% - 1rem); width: calc(25% - 2rem);
height: auto; height: auto;
float: left; float: left;
margin-left: 0; margin: 2rem 1rem 1rem;
} }
fieldset { fieldset {
@ -294,6 +285,12 @@ fieldset {
margin-left: 0; margin-left: 0;
} }
.catalog .book {
height: 16.25rem;
max-width: calc(100% / 3 - 1rem);
margin: 0 1rem 1rem 0;
}
.catalog-navigation { .catalog-navigation {
width: 75%; width: 75%;
float: right; float: right;

42
assets/styles/layouts/_signup.scss
Unescape View File

@ -0,0 +1,42 @@
.mu_register.wp-signup-container {
@extend .page-section;
margin: rem(120) auto 0;
display: flex;
flex-direction: column;
* {
text-align: left;
}
h2 {
text-align: center;
order: -1;
}
.mu_alert {
margin-bottom: 2rem;
}
form {
margin-top: 0;
}
input:not([type="submit"]) {
padding: 0;
}
.checkbox {
margin-right: 1em;
}
.submit {
text-align: center;
}
[type="submit"] {
width: auto;
margin: 0 auto;
text-align: center;
}
}

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

@ -1,9 +1,12 @@
{ {
"/scripts/aldine.js": "/scripts/aldine.js?id=ba190765ddbe404a6d2d", "/scripts/aldine.js": "/scripts/aldine.js?id=1f58027f7de9942caf57",
"/styles/aldine.css": "/styles/aldine.css?id=fa7bbb302e39b92990db", "/styles/aldine.css": "/styles/aldine.css?id=aa47048cd3a38bde8f17",
"/styles/editor.css": "/styles/editor.css?id=d96762ab5918cde0c2e1", "/styles/editor.css": "/styles/editor.css?id=d96762ab5918cde0c2e1",
"/styles/blocks/page-section/editor.css": "/styles/blocks/page-section/editor.css?id=d41d8cd98f00b204e980", "/styles/blocks/page-section/editor.css":
"/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53", "/styles/blocks/page-section/editor.css?id=d41d8cd98f00b204e980",
"/scripts/catalog-admin.js": "/scripts/catalog-admin.js?id=d25f1240496bd3607338", "/scripts/customizer.js": "/scripts/customizer.js?id=1b0d3cfc1d85f460af53",
"/scripts/blocks/page-section/block.js": "/scripts/blocks/page-section/block.js?id=0d61a9b8d8de8775309e" "/scripts/catalog-admin.js":
} "/scripts/catalog-admin.js?id=d25f1240496bd3607338",
"/scripts/blocks/page-section/block.js":
"/scripts/blocks/page-section/block.js?id=0d61a9b8d8de8775309e"
}

2
dist/styles/aldine.css vendored
View File

File diff suppressed because one or more lines are too long

8
package-lock.json generated
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "@pressbooks/pressbooks-aldine", "name": "@pressbooks/pressbooks-aldine",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
@ -284,9 +284,9 @@
} }
}, },
"aetna": { "aetna": {
"version": "1.0.0-alpha.0", "version": "1.0.0-alpha.3",
"resolved": "https://registry.npmjs.org/aetna/-/aetna-1.0.0-alpha.0.tgz", "resolved": "https://registry.npmjs.org/aetna/-/aetna-1.0.0-alpha.3.tgz",
"integrity": "sha512-AxjejoGeiv0OsQNuusC5A50ByuoXknA6SKjD/d0AMV3tCJuX26lZq1bnpTalVjqtk6Kzyo6nHU2nKzjltlTR+Q==", "integrity": "sha512-2/2ymhwu74C3DYaX+6Y4b5j5jh0DaXnBWfyMh1DU2H64i2ib5dSKA2oYUFv1vQnL7niplxWUrmGBXaisL1i28Q==",
"requires": { "requires": {
"@frctl/fractal": "1.1.7" "@frctl/fractal": "1.1.7"
} }

4
package.json
Unescape View File

@ -1,6 +1,6 @@
{ {
"name": "@pressbooks/pressbooks-aldine", "name": "@pressbooks/pressbooks-aldine",
"version": "1.0.0-beta.1", "version": "1.0.0-beta.2",
"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.",
@ -53,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",

4
page-catalog.php
Unescape View File

@ -26,9 +26,9 @@ $available_licenses = get_available_licenses( $catalog_data );
$subjects = ( defined( 'PB_PLUGIN_VERSION' ) ) ? \Pressbooks\Metadata\get_thema_subjects() : []; $subjects = ( defined( 'PB_PLUGIN_VERSION' ) ) ? \Pressbooks\Metadata\get_thema_subjects() : [];
$available_subjects = get_available_subjects( $catalog_data ); $available_subjects = get_available_subjects( $catalog_data );
if ( ! empty( $catalog_data['books'] ) ) : ?> if ( ! empty( $catalog_data['books'] ) ) :
get_header(); ?> get_header(); ?>
<div id="primary" class="content-area"> <div id="primary" class="content-area">
<main id="main" class="site-main"> <main id="main" class="site-main">

6
yarn.lock
Unescape View File

@ -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"

Write Preview
Loading…
Cancel
Save