Merge branch 'master' into header-aria-label

This commit is contained in:
IanDelMar 2019-12-13 08:30:59 +01:00 committed by GitHub
commit e980abf7ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
35 changed files with 37 additions and 36 deletions

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying 404 pages (not found). * The template for displaying 404 pages (not found)
* *
* @package understrap * @package understrap
*/ */

View File

@ -8,6 +8,8 @@ Website: [https://understrap.com](https://understrap.com)
Child Theme Project: [https://github.com/understrap/understrap-child](https://github.com/understrap/understrap-child) Child Theme Project: [https://github.com/understrap/understrap-child](https://github.com/understrap/understrap-child)
OverStrap Child Themes: [https://understrap.com/overstrap/](https://understrap.com/overstrap/)
## About ## About
Im a huge fan of Underscores, Bootstrap, and Sass. Why not combine these into a solid WordPress Theme Framework? Thats what UnderStrap is. You can use it as a starter theme and build your own theme on top of it. Or you can use it as a parent theme and create your own child theme for UnderStrap. Im a huge fan of Underscores, Bootstrap, and Sass. Why not combine these into a solid WordPress Theme Framework? Thats what UnderStrap is. You can use it as a starter theme and build your own theme on top of it. Or you can use it as a parent theme and create your own child theme for UnderStrap.

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying archive pages. * The template for displaying archive pages
* *
* Learn more: http://codex.wordpress.org/Template_Hierarchy * Learn more: http://codex.wordpress.org/Template_Hierarchy
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying the author pages. * The template for displaying the author pages
* *
* Learn more: https://codex.wordpress.org/Author_Templates * Learn more: https://codex.wordpress.org/Author_Templates
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying comments. * The template for displaying comments
* *
* The area of the page that contains both current comments * The area of the page that contains both current comments
* and the comment form. * and the comment form.

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying the footer. * The template for displaying the footer
* *
* Contains the closing of the #content div and all content after * Contains the closing of the #content div and all content after
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Hero setup. * Hero setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Left sidebar check. * Left sidebar check
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Right sidebar check. * Right sidebar check
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The header for our theme. * The header for our theme
* *
* Displays all of the <head> section and everything up till <div id="content"> * Displays all of the <head> section and everything up till <div id="content">
* *
@ -30,7 +30,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<a class="skip-link sr-only sr-only-focusable" href="#content"><?php esc_html_e( 'Skip to content', 'understrap' ); ?></a> <a class="skip-link sr-only sr-only-focusable" href="#content"><?php esc_html_e( 'Skip to content', 'understrap' ); ?></a>
<nav class="navbar navbar-expand-md navbar-dark bg-primary" aria-labelledby="main-nav-label"> <nav id="main-nav" class="navbar navbar-expand-md navbar-dark bg-primary" aria-labelledby="main-nav-label">
<h2 id="main-nav-label" class="sr-only"> <h2 id="main-nav-label" class="sr-only">
<?php esc_html_e( 'Main Navigation', 'understrap' ); ?> <?php esc_html_e( 'Main Navigation', 'understrap' ); ?>
@ -53,7 +53,6 @@ $container = get_theme_mod( 'understrap_container_type' );
<?php endif; ?> <?php endif; ?>
<?php } else { <?php } else {
the_custom_logo(); the_custom_logo();
} ?><!-- end custom logo --> } ?><!-- end custom logo -->

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Comment layout. * Comment layout
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Custom header setup. * Custom header setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Rest in peace. * Rest in peace
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Custom functions that act independently of the theme templates. * Custom functions that act independently of the theme templates
* *
* Eventually, some of the functionality here could be replaced by core features. * Eventually, some of the functionality here could be replaced by core features.
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Custom hooks. * Custom hooks
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Pagination layout. * Pagination layout
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Theme basic setup. * Theme basic setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Custom template tags for this theme. * Custom template tags for this theme
* *
* Eventually, some of the functionality here could be replaced by core features. * Eventually, some of the functionality here could be replaced by core features.
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The main template file. * The main template file
* *
* This is the most generic template file in a WordPress theme * This is the most generic template file in a WordPress theme
* and one of the two required files for a theme (the other being style.css). * and one of the two required files for a theme (the other being style.css).

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Blank content partial template. * Blank content partial template
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Content empty partial template. * Content empty partial template
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template part for displaying a message that posts cannot be found. * The template part for displaying a message that posts cannot be found
* *
* Learn more: http://codex.wordpress.org/Template_Hierarchy * Learn more: http://codex.wordpress.org/Template_Hierarchy
* *

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Search results partial template. * Search results partial template
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Single post partial template. * Single post partial template
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Post rendering content according to caller of get_template_part. * Post rendering content according to caller of get_template_part
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying all pages. * The template for displaying all pages
* *
* This is the template that displays all pages by default. * This is the template that displays all pages by default.
* Please note that this is the WordPress construct of pages * Please note that this is the WordPress construct of pages

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying search results pages. * The template for displaying search results pages
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Sidebar setup for footer full. * Sidebar setup for footer full
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Sidebar - hero setup. * Sidebar - hero setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Sidebar - hero canvas setup. * Sidebar - hero canvas setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The sidebar containing the main widget area. * The sidebar containing the main widget area
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The right sidebar containing the main widget area. * The right sidebar containing the main widget area
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* Static hero sidebar setup. * Static hero sidebar setup
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The sidebar containing the main widget area. * The sidebar containing the main widget area
* *
* @package understrap * @package understrap
*/ */

View File

@ -1,6 +1,6 @@
<?php <?php
/** /**
* The template for displaying all single posts. * The template for displaying all single posts
* *
* @package understrap * @package understrap
*/ */