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

Merge branch 'dev' into php-81-support

pull/374/head
SteelWagstaff 2 years ago
parent
3a73f3e98f 88db403b1e
commit
3b7244ba7b
12 changed files with 131 additions and 44 deletions
Split View
  1. 2
      assets/styles/components/_book.scss
  2. 17
      assets/styles/components/_featured_book.scss
  3. 11
      assets/styles/layouts/_header.scss
  4. 2
      assets/styles/layouts/_page.scss
  5. 37
      dist/styles/aldine.css
  6. 6
      header.php
  7. 22
      inc/customizer/namespace.php
  8. 18
      inc/helpers/namespace.php
  9. 28
      languages/pressbooks-aldine.pot
  10. 27
      package-lock.json
  11. 2
      phpcs.ruleset.xml
  12. 3
      webpack.mix.js

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

@ -48,7 +48,7 @@
margin: .5rem 0 0;
font-size: 0.875rem;
text-align: left;
display: box;
display: flex;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;

17
assets/styles/components/_featured_book.scss
Unescape View File

@ -1,18 +1,25 @@
#latest-books {
.books {
align-items: flex-start;
}
}
.featured_book {
display: flex;
flex-direction: column;
justify-content: flex-start;
justify-content: space-between;
width: 100%;
max-width: 18rem;
height: 25rem;
height: 100%;
border: solid 1px var(--accent);
margin: 0 0 2rem;
&__cover {
aspect-ratio: 3 / 4;
width: 100%;
height: 80%;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
min-height: 17rem;
}
a {
@ -27,5 +34,7 @@
justify-content: center;
align-items: center;
font-weight: 500;
margin-top: 1rem;
min-height: 4rem;
}
}

11
assets/styles/layouts/_header.scss
Unescape View File

@ -20,12 +20,19 @@
}
}
.home #content {
.home #content{
margin-top: -540px;
background: transparent;
&.custom-homepage {
margin-top: 0;
}
@media #{$breakpoint-large} {
margin-top: -880px;
&.custom-homepage {
margin-top: 0;
}
}
}
@ -68,7 +75,7 @@
}
}
.page:not(.home) .header {
.page .header {
height: rem(240);
@media #{$breakpoint-large} {

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

@ -22,6 +22,6 @@ body {
}
}
.page.home:not(.has-sections) article {
.page article {
margin-top: 0;
}

37
dist/styles/aldine.css vendored
Unescape View File

@ -1901,7 +1901,9 @@ nav {
margin: 0.5rem 0 0;
font-size: 0.875rem;
text-align: left;
display: box;
display: -webkit-box;
display: -ms-flexbox;
display: flex;
overflow: hidden;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
@ -1937,6 +1939,12 @@ nav {
}
}
#latest-books .books {
-webkit-box-align: start;
-ms-flex-align: start;
align-items: flex-start;
}
.featured_book {
display: -webkit-box;
display: -ms-flexbox;
@ -1945,20 +1953,21 @@ nav {
-webkit-box-direction: normal;
-ms-flex-direction: column;
flex-direction: column;
-webkit-box-pack: start;
-ms-flex-pack: start;
justify-content: flex-start;
-webkit-box-pack: justify;
-ms-flex-pack: justify;
justify-content: space-between;
width: 100%;
max-width: 18rem;
height: 25rem;
height: 100%;
border: solid 1px var(--accent);
margin: 0 0 2rem;
}
.featured_book__cover {
aspect-ratio: 3/4;
width: 100%;
height: 80%;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
min-height: 17rem;
}
.featured_book a {
margin: 0;
@ -1979,6 +1988,8 @@ nav {
-ms-flex-align: center;
align-items: center;
font-weight: 500;
margin-top: 1rem;
min-height: 4rem;
}
label {
@ -2155,10 +2166,16 @@ input[type=submit] {
margin-top: -540px;
background: transparent;
}
.home #content.custom-homepage {
margin-top: 0;
}
@media screen and (min-width: 60rem) {
.home #content {
margin-top: -880px;
}
.home #content.custom-homepage {
margin-top: 0;
}
}
.home .entry-header {
@ -2208,11 +2225,11 @@ input[type=submit] {
}
}
.page:not(.home) .header {
.page .header {
height: 15rem;
}
@media screen and (min-width: 60rem) {
.page:not(.home) .header {
.page .header {
height: 55rem;
}
}
@ -2282,7 +2299,7 @@ body #content a.call-to-action {
text-decoration: none;
}
.page.home:not(.has-sections) article {
.page article {
margin-top: 0;
}

6
header.php
Unescape View File

@ -9,6 +9,8 @@
* @package Aldine
*/
use function Aldine\Helpers\custom_homepage;
?>
<!doctype html>
<html <?php language_attributes(); ?>>
@ -20,7 +22,7 @@
<?php wp_head(); ?>
</head>
<body <?php body_class(); ?> data-barba="wrapper">
<body <?php body_class(); ?>>
<svg style="display: none;" xmlns="http://www.w3.org/2000/svg">
<defs>
<symbol id="icon-pressbooks" fill="currentColor" viewBox="0 0 45 44">
@ -102,4 +104,4 @@
</div>
</header> <!-- .header -->
<div id="content" class="site-content clearfix">
<div id="content" class="site-content clearfix <?php echo custom_homepage(); ?>">

22
inc/customizer/namespace.php
Unescape View File

@ -227,6 +227,28 @@ function customize_register( \WP_Customize_Manager $wp_customize ) {
]
);
}
$wp_customize->add_section(
'page_on_front', [
'title' => __( 'Front Page Settings', 'pressbooks-aldine' ),
'priority' => 24,
]
);
$wp_customize->add_setting(
'page_on_front', [
'type' => 'option',
'capability' => 'manage_options',
],
);
$wp_customize->add_control(
'page_on_front', [
'label' => __( 'Network Home Page', 'pressbooks-aldine' ),
'section' => 'page_on_front',
'type' => 'dropdown-pages',
]
);
}
$wp_customize->add_section(

18
inc/helpers/namespace.php
Unescape View File

@ -334,7 +334,7 @@ function get_default_menu( $items = '' ) {
'SignOut' => 'sign-out',
];
$link = ( is_front_page() ) ? network_home_url( '#main' ) : network_home_url( '/' );
$link = network_home_url( '/' );
$items = sprintf(
'<li class="%3$s %3$s-%4$s"><a href="%1$s">%2$s</a></li>',
$link,
@ -565,3 +565,19 @@ function get_catalog_page(): ?\WP_Post {
]);
return $catalog_pages[0] ?? null;
}
/**
* This function generate a class to know if the current page is a custom frontpage.
*
* @return string
*/
function custom_homepage(): string {
$home_page = get_option( 'page_on_front' );
if ( $home_page ) {
$template = get_page_template_slug( $home_page );
if ( 'page-catalog.php' === $template ) {
return 'custom-homepage';
}
}
return '';
}

28
languages/pressbooks-aldine.pot
Unescape View File

@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2022-11-08T16:31:12+00:00\n"
"POT-Creation-Date: 2022-11-15T20:06:28+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.7.1\n"
"X-Domain: pressbooks-aldine\n"
@ -113,16 +113,16 @@ msgstr ""
msgid "You must run <code>composer install</code> from the Aldine directory."
msgstr ""
#: header.php:45
#: header.php:47
msgid "Skip to content"
msgstr ""
#. translators: %s name of network
#: header.php:75
#: header.php:77
msgid "Logo for %s"
msgstr ""
#: header.php:86
#: header.php:88
msgid "Toggle Menu"
msgstr ""
@ -395,28 +395,36 @@ msgstr ""
msgid "Featured book"
msgstr ""
#: inc/customizer/namespace.php:234
#: inc/customizer/namespace.php:233
msgid "Front Page Settings"
msgstr ""
#: inc/customizer/namespace.php:247
msgid "Network Home Page"
msgstr ""
#: inc/customizer/namespace.php:256
msgid "Contact Form"
msgstr ""
#: inc/customizer/namespace.php:245
#: inc/customizer/namespace.php:267
msgid "Show Contact Form"
msgstr ""
#: inc/customizer/namespace.php:255
#: inc/customizer/namespace.php:277
#: partials/contact-form.php:13
msgid "Contact Us"
msgstr ""
#: inc/customizer/namespace.php:260
#: inc/customizer/namespace.php:282
msgid "Contact Form Title"
msgstr ""
#: inc/customizer/namespace.php:274
#: inc/customizer/namespace.php:296
msgid "Contact Email"
msgstr ""
#: inc/customizer/namespace.php:286
#: inc/customizer/namespace.php:308
msgid "Contact Link"
msgstr ""

27
package-lock.json generated
Unescape View File

@ -16386,9 +16386,9 @@
}
},
"node_modules/socket.io-parser": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
"integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz",
"integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==",
"dependencies": {
"component-emitter": "~1.3.0",
"debug": "~3.1.0",
@ -16415,13 +16415,16 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"node_modules/socket.io/node_modules/socket.io-parser": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz",
"integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==",
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.2.tgz",
"integrity": "sha512-QFZBaZDNqZXeemwejc7D39jrq2eGK/qZuVDiMPKzZK1hLlNvjGilGt4ckfQZeVX4dGmuPzCytN9ZW1nQlEWjgA==",
"dependencies": {
"component-emitter": "1.2.1",
"debug": "~4.1.0",
"isarray": "2.0.1"
},
"engines": {
"node": ">=10.0.0"
}
},
"node_modules/sockjs": {
@ -32645,9 +32648,9 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
},
"socket.io-parser": {
"version": "3.4.1",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.1.tgz",
"integrity": "sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==",
"version": "3.4.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.4.2.tgz",
"integrity": "sha512-QFZBaZDNqZXeemwejc7D39jrq2eGK/qZuVDiMPKzZK1hLlNvjGilGt4ckfQZeVX4dGmuPzCytN9ZW1nQlEWjgA==",
"requires": {
"component-emitter": "1.2.1",
"debug": "~4.1.0",
@ -32680,9 +32683,9 @@
}
},
"socket.io-parser": {
"version": "3.3.2",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.2.tgz",
"integrity": "sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==",
"version": "3.3.3",
"resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz",
"integrity": "sha512-qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==",
"requires": {
"component-emitter": "~1.3.0",
"debug": "~3.1.0",

2
phpcs.ruleset.xml
Unescape View File

@ -16,5 +16,5 @@
</rule>
<!-- Run against the PHPCompatibility ruleset -->
<rule ref="PHPCompatibility"/>
<config name="testVersion" value="7.3-7.4"/>
<config name="testVersion" value="8.0-8.1"/>
</ruleset>

3
webpack.mix.js
Unescape View File

@ -74,4 +74,7 @@ mix.webpackConfig( {
isotope: 'isotope-layout',
},
},
stats: {
children: true
}
} );

Write Preview
Loading…
Cancel
Save