Browse Source

Fix internal pages (closes #18).

pull/49/head
Ned Zimmerman 7 years ago
parent
commit
b25c41e6b3
No known key found for this signature in database
GPG Key ID: FF56334A013120CA
  1. 1
      assets/styles/aldine.scss
  2. 11
      assets/styles/layouts/_front-page.scss
  3. 90
      assets/styles/layouts/_pages.scss
  4. 0
      assets/styles/layouts/pages__deprecated/_catalog.scss
  5. 0
      assets/styles/layouts/pages__deprecated/_front-page.scss
  6. 2
      dist/mix-manifest.json
  7. 2
      dist/styles/aldine.css
  8. 13
      inc/helpers/namespace.php

1
assets/styles/aldine.scss

@ -14,3 +14,4 @@
@import "components/forms";
@import "layouts/header";
@import "layouts/front-page";
@import "layouts/pages";

11
assets/styles/layouts/_front-page.scss

@ -6,6 +6,17 @@
}
}
.home .entry-content:not(.blocks) {
@extend .block;
width: 100%;
max-width: rem(800);
margin: 0 auto;
@media #{$breakpoint-large} {
margin-bottom: 4rem;
}
}
.latest-books {
padding: 0 0 9.625rem;

90
assets/styles/layouts/_pages.scss

@ -1,79 +1,13 @@
@import 'pages/front-page';
@import 'pages/catalog';
.page {
.page-header {
h1 {
font-size: rem(30);
font-weight: 600;
color: var(--primary, $brand-primary);
letter-spacing: 2px;
line-height: (36/30);
text-transform: uppercase;
text-align: center;
margin: 0;
padding-top: 1rem;
&::before {
content: "";
display: block;
margin: 0 auto 1em;
width: 46px;
height: 5px;
background: var(--accent, $brand-accent);
}
}
}
.page-content {
flex-direction: column;
justify-content: center;
align-items: center;
padding: 0 0.78125rem;
display: flex;
height: auto;
min-height: rem(445);
background-color: $white;
margin: rem(-400) auto 0;
box-shadow: -3px 5px 4px 2px rgba(135, 135, 135, 0.09);
text-align: center;
p {
font-size: rem(18);
line-height: (32/16);
}
}
}
@media (min-width: $medium) {
.page {
.page-header h1 {
font-size: rem(48);
line-height: (56/48);
}
.page-content {
width: rem(775);
min-height: rem(494);
margin: rem(-600) auto rem(119);
padding: 0 90px;
&:last-child {
margin-bottom: 4.0625rem;
}
p {
font-size: rem(18);
line-height: (32/18);
}
}
}
}
@media (min-width: $large) {
.page {
.page-content {
width: rem(1115);
}
}
.page:not(.home) article {
.entry-header h1 {
@extend .h2;
}
@extend .block;
text-align: left;
width: 100%;
max-width: rem(800);
margin-top: calc(-80%);
margin-left: auto;
margin-right: auto;
}

0
assets/styles/layouts/pages/_catalog.scss → assets/styles/layouts/pages__deprecated/_catalog.scss

0
assets/styles/layouts/pages/_front-page.scss → assets/styles/layouts/pages__deprecated/_front-page.scss

2
dist/mix-manifest.json vendored

@ -1,6 +1,6 @@
{
"/scripts/aldine.js": "/scripts/aldine.js?id=b3e9fc98283f6851d026",
"/styles/aldine.css": "/styles/aldine.css?id=1be125553f6566e4af78",
"/styles/aldine.css": "/styles/aldine.css?id=029239f1f66d8618b8a3",
"/styles/editor.css": "/styles/editor.css?id=1154985c5551d57d94cc",
"/scripts/customizer.js": "/scripts/customizer.js?id=b7707466ef7695673a2e"
}

2
dist/styles/aldine.css vendored

File diff suppressed because one or more lines are too long

13
inc/helpers/namespace.php

@ -71,13 +71,12 @@ function get_catalog_licenses() {
* @return string $items
*/
function get_default_menu( $items = '' ) {
if ( ! is_front_page() ) {
$items = sprintf(
'<li><a href="%1$s">%2$s</a></li>',
'/',
__( 'Home', 'pressbooks-aldine' )
) . $items;
}
$link = ( is_front_page() ) ? network_home_url( '#main' ) : network_home_url( '/' );
$items = sprintf(
'<li><a href="%1$s">%2$s</a></li>',
$link,
__( 'Home', 'pressbooks-aldine' )
) . $items;
if ( get_option( 'pb_network_contact_form' ) ) {
$items .= sprintf(
'<li><a href="%1$s">%2$s</a></li>',

Loading…
Cancel
Save