mirror
/
understrap
mirror of https://github.com/understrap/understrap.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into category-widget

This commit is contained in:
IanDelMar 2022-08-10 00:52:21 +02:00
parent d31380f0d3 3a47cd078d
commit 20d328d69b
23 changed files with 87 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
css/custom-editor-style-bootstrap4.css
View File

@ -674,16 +674,19 @@ template {
height: auto;
}
.figure, .wp-block-image > figure, figure.wp-block-image {
.figure, figure.wp-block-image,
.wp-block-image > figure {
display: inline-block;
}
.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
.figure-img, figure.wp-block-image img,
.wp-block-image > figure img {
margin-bottom: 0.5rem;
line-height: 1;
}
.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
.figure-caption, figure.wp-block-image figcaption,
.wp-block-image > figure figcaption {
font-size: 90%;
color: #6c757d;
}
@ -4569,9 +4572,7 @@ a.text-dark:hover, a.text-dark:focus {
color: #343a40;
}
figure.wp-block-image {
display: block;
}
figure.wp-block-image,
.wp-block-image > figure {
display: block;
}

2
css/custom-editor-style-bootstrap4.css.map
View File

File diff suppressed because one or more lines are too long

2
css/custom-editor-style-bootstrap4.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/custom-editor-style-bootstrap4.min.css.map
View File

File diff suppressed because one or more lines are too long

13
css/custom-editor-style.css
View File

@ -717,16 +717,19 @@ progress {
height: auto;
}
.figure, .wp-block-image > figure, figure.wp-block-image {
.figure, figure.wp-block-image,
.wp-block-image > figure {
display: inline-block;
}
.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
.figure-img, figure.wp-block-image img,
.wp-block-image > figure img {
margin-bottom: 0.5rem;
line-height: 1;
}
.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
.figure-caption, figure.wp-block-image figcaption,
.wp-block-image > figure figcaption {
font-size: 0.875em;
color: #6c757d;
}
@ -5345,9 +5348,7 @@ progress {
color: #212529;
}
figure.wp-block-image {
display: block;
}
figure.wp-block-image,
.wp-block-image > figure {
display: block;
}

2
css/custom-editor-style.css.map
View File

File diff suppressed because one or more lines are too long

2
css/custom-editor-style.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/custom-editor-style.min.css.map
View File

File diff suppressed because one or more lines are too long

13
css/theme-bootstrap4.css
View File

@ -481,16 +481,19 @@ mark,
height: auto;
}
.figure, .wp-block-image > figure, figure.wp-block-image {
.figure, figure.wp-block-image,
.wp-block-image > figure {
display: inline-block;
}
.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
.figure-img, figure.wp-block-image img,
.wp-block-image > figure img {
margin-bottom: 0.5rem;
line-height: 1;
}
.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
.figure-caption, figure.wp-block-image figcaption,
.wp-block-image > figure figcaption {
font-size: 90%;
color: #6c757d;
}
@ -11490,9 +11493,7 @@ article img,
color: #343a40;
}
figure.wp-block-image {
display: block;
}
figure.wp-block-image,
.wp-block-image > figure {
display: block;
}

2
css/theme-bootstrap4.css.map
View File

File diff suppressed because one or more lines are too long

2
css/theme-bootstrap4.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/theme-bootstrap4.min.css.map
View File

File diff suppressed because one or more lines are too long

13
css/theme.css
View File

@ -611,16 +611,19 @@ progress {
height: auto;
}
.figure, .wp-block-image > figure, figure.wp-block-image {
.figure, figure.wp-block-image,
.wp-block-image > figure {
display: inline-block;
}
.figure-img, .wp-block-image > figure img, figure.wp-block-image img {
.figure-img, figure.wp-block-image img,
.wp-block-image > figure img {
margin-bottom: 0.5rem;
line-height: 1;
}
.figure-caption, .wp-block-image > figure figcaption, figure.wp-block-image figcaption {
.figure-caption, figure.wp-block-image figcaption,
.wp-block-image > figure figcaption {
font-size: 0.875em;
color: #6c757d;
}
@ -12403,9 +12406,7 @@ article img,
color: #212529;
}
figure.wp-block-image {
display: block;
}
figure.wp-block-image,
.wp-block-image > figure {
display: block;
}

2
css/theme.css.map
View File

File diff suppressed because one or more lines are too long

2
css/theme.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
css/theme.min.css.map
View File

File diff suppressed because one or more lines are too long

32
global-templates/navbar-branding.php Normal file
View File

@ -0,0 +1,32 @@
<?php
/**
* Navbar branding
*
* @package Understrap
*/
// Exit if accessed directly.
defined( 'ABSPATH' ) || exit;
if ( ! has_custom_logo() ) { ?>
<?php if ( is_front_page() && is_home() ) : ?>
<h1 class="navbar-brand mb-0">
<a rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url">
<?php bloginfo( 'name' ); ?>
</a>
</h1>
<?php else : ?>
<a class="navbar-brand" rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url">
<?php bloginfo( 'name' ); ?>
</a>
<?php endif; ?>
<?php
} else {
the_custom_logo();
}

20
global-templates/navbar-collapse-bootstrap4.php
View File

@ -22,25 +22,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<div class="container">
<?php endif; ?>
<!-- Your site title as branding in the menu -->
<?php if ( ! has_custom_logo() ) { ?>
<?php if ( is_front_page() && is_home() ) : ?>
<h1 class="navbar-brand mb-0"><a rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a></h1>
<?php else : ?>
<a class="navbar-brand" rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a>
<?php endif; ?>
<?php
} else {
the_custom_logo();
}
?>
<!-- end custom logo -->
<?php get_template_part( 'global-templates/navbar-branding' ); ?>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="<?php esc_attr_e( 'Toggle navigation', 'understrap' ); ?>">
<span class="navbar-toggler-icon"></span>

21
global-templates/navbar-collapse-bootstrap5.php
View File

@ -20,25 +20,8 @@ $container = get_theme_mod( 'understrap_container_type' );
<div class="<?php echo esc_attr( $container ); ?>">
<!-- Your site title as branding in the menu -->
<?php if ( ! has_custom_logo() ) { ?>
<?php if ( is_front_page() && is_home() ) : ?>
<h1 class="navbar-brand mb-0"><a rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a></h1>
<?php else : ?>
<a class="navbar-brand" rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a>
<?php endif; ?>
<?php
} else {
the_custom_logo();
}
?>
<!-- end custom logo -->
<!-- Your site branding in the menu -->
<?php get_template_part( 'global-templates/navbar-branding' ); ?>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="<?php esc_attr_e( 'Toggle navigation', 'understrap' ); ?>">
<span class="navbar-toggler-icon"></span>

21
global-templates/navbar-offcanvas-bootstrap5.php
View File

@ -20,25 +20,8 @@ $container = get_theme_mod( 'understrap_container_type' );
<div class="<?php echo esc_attr( $container ); ?>">
<!-- Your site title as branding in the menu -->
<?php if ( ! has_custom_logo() ) { ?>
<?php if ( is_front_page() && is_home() ) : ?>
<h1 class="navbar-brand mb-0"><a rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a></h1>
<?php else : ?>
<a class="navbar-brand" rel="home" href="<?php echo esc_url( home_url( '/' ) ); ?>" itemprop="url"><?php bloginfo( 'name' ); ?></a>
<?php endif; ?>
<?php
} else {
the_custom_logo();
}
?>
<!-- end custom logo -->
<!-- Your site branding in the menu -->
<?php get_template_part( 'global-templates/navbar-branding' ); ?>
<button class="navbar-toggler" type="button" data-bs-toggle="offcanvas" data-bs-target="#navbarNavOffcanvas" aria-controls="navbarNavOffcanvas" aria-expanded="false" aria-label="<?php esc_attr_e( 'Toggle navigation', 'understrap' ); ?>">
<span class="navbar-toggler-icon"></span>

7
inc/pagination.php
View File

@ -69,7 +69,6 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
if ( empty( $links ) ) {
return;
}
?>
<nav aria-labelledby="posts-nav-label">
@ -84,7 +83,11 @@ if ( ! function_exists( 'understrap_pagination' ) ) {
foreach ( $links as $key => $link ) {
?>
<li class="page-item <?php echo strpos( $link, 'current' ) ? 'active' : ''; ?>">
<?php echo str_replace( 'page-numbers', 'page-link', $link ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>
<?php
$search = array( 'page-numbers', 'dots' );
$replace = array( 'page-link', 'disabled dots' );
echo str_replace( $search, $replace, $link ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
?>
</li>
<?php
}

2
inc/setup.php
View File

@ -70,7 +70,7 @@ if ( ! function_exists( 'understrap_setup' ) ) {
/*
* Adding Thumbnail basic support
*/
add_theme_support( 'post-thumbnails', true );
add_theme_support( 'post-thumbnails', array() );
/*
* Adding support for Widget edit icons in customizer

19
src/sass/theme/_blocks.scss
View File

@ -12,8 +12,10 @@
}
}
// Image captions
figure.wp-block-image {
figure.wp-block-image, // Image captions
.wp-block-image > figure // Alternate/classic editor image captions
{
@extend .figure;
display: block;
img {
@ -24,19 +26,6 @@ figure.wp-block-image {
}
}
// Alternate/classic editor image captions.
.wp-block-image > figure {
@extend .figure;
display: block;
img {
@extend .figure-img;
}
figcaption {
@extend .figure-caption;
}
}
// Wide alignments and covers.
body.understrap-no-sidebar {
.alignwide,