Skip to content

Commit ac69b56

Browse files
author
Eric Amundson
authored
Merge pull request #25 from sewmyheadon/development
Development
2 parents 7577eaf + a05ed6e commit ac69b56

File tree

105 files changed

+2363
-14130
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2363
-14130
lines changed

CHANGELOG.md

Lines changed: 38 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
**Post-fork Spurs releases**
22

3-
- ** Spurs update release 0.9.4 Oct 29, 2019 **
3+
- ** Spurs update release 0.9.6 Dec 17, 2019 **
4+
- Update Woo cart.php template
5+
- Update version and npm and composer dependencies.
6+
7+
- ** Spurs update release 0.9.5 Oct 30, 2019 **
8+
- Theme file cleanup - add/remove markup & comments
9+
- Remove legacy files
10+
11+
- ** Spurs update release 0.9.4 Oct 29, 2019 **
412
- Update WooCommerce template files
513
- Add helpful functions
614
- Minor docs updates
7-
8-
- ** Spurs update release 0.9.1 Dec 21, 2018 **
15+
16+
- ** Spurs update release 0.9.1 Dec 21, 2018 **
917
- Update WooCommerce template files
1018

11-
- ** Spurs update release 0.9.0 October 23, 2018 **
19+
- ** Spurs update release 0.9.0 October 23, 2018 **
1220
- NOTE: do not upgrade an existing Spurs installation as this update contains breaking changes
1321
- Updates to documentation
1422
- Reorganize file structure to better manage theme partials in `templates/` folder
@@ -19,45 +27,45 @@
1927
- Add new image and markup helper functions
2028
- Update WooCommerce template files
2129

22-
- ** Spurs update release 0.8.9 August 12, 2018 **
30+
- ** Spurs update release 0.8.9 August 12, 2018 **
2331
- Update WooCommerce Templates
24-
25-
- ** Spurs update release 0.8.8 August 11, 2018 **
32+
33+
- ** Spurs update release 0.8.8 August 11, 2018 **
2634
- Update to Bootstrap 4.1.3
2735

28-
- ** Spurs update release 0.8.3 April 11, 2018 **
36+
- ** Spurs update release 0.8.3 April 11, 2018 **
2937
- Incorporate relevant package.json updates (up to v. 0.8.2)
30-
31-
- ** Spurs update release 0.8.2 April 11, 2018 **
38+
39+
- ** Spurs update release 0.8.2 April 11, 2018 **
3240
- Incorporate relevant UnderStrap updates (up to v. 0.8.2)
3341
- Fix sidebar function logic
3442
- Add helper functions
3543
- Reconfigure gulp preferences
36-
37-
- ** Spurs initial release 0.6.0 March 18th 2018 **
44+
45+
- ** Spurs initial release 0.6.0 March 18th 2018 **
3846
- Fix sidebar functions so default theme customizer and page template override choices work
39-
- Update docs
47+
- Update docs
4048

41-
- ** Spurs initial release 0.5.0 December 17th 2017 **
49+
- ** Spurs initial release 0.5.0 December 17th 2017 **
4250
- Incorporate theme wrapper and try to make code DRY
4351
- Create example blank template, illustrating wrapper
4452
- Changes to customizer setting labels
4553
- Fixing customizer settings
4654
- Code cleanup and reformatting
4755
- Change name and namespace to Spurs
4856
- Create style class helper functions for sidebar and content
49-
- Update docs
50-
57+
- Update docs
58+
5159
**Pre-fork UnderStrap releases**
5260

53-
- ** Release 0.6.11 December 11th 2017 **
61+
- ** Release 0.6.11 December 11th 2017 **
5462
- Fixing WooCommerce functions
5563
- Fixing sanitizing, escaping and prefix´s issues
5664
- Fixing customizer settings
5765
- Removing duplicate code
5866
- Resort theme-settings.php
5967
- Cleaning functions.php
60-
- Changing licensing infos
68+
- Changing licensing infos
6169

6270
- ** Release 0.6.10 December 4th 2017 **
6371
- Hotfix release
@@ -75,28 +83,28 @@
7583

7684
- ** Release 0.6.8 November 27th 2017 **
7785
- Theme check updates
78-
- Bugfix release
86+
- Bugfix release
7987

8088
- ** Release 0.6.7 November 24th 2017 **
8189
- Workaround for jQuery inconsistency problem between Bootstrap Beta 2 and WordPress in noConflict mode
8290
- Adding jQuery slim 3.2.1
8391
- Update page.php - thx @Vishal-Deshpande
8492
- Fixing colormap problem with beta 2
8593
- Making navwalker function pluggable - Thx @bruceconlon
86-
- Adding WordPress title attribute - Thx @JDVirtual and @Thomas-A-Reinert
94+
- Adding WordPress title attribute - Thx @JDVirtual and @Thomas-A-Reinert
8795
- Fixing comments in _theme_variable.scss - thx @ianwyllie
8896
- Adding spaces the separate "posted on" and "edited" timestamps - Thx @bruceconlon
89-
97+
9098

9199
- ** Release 0.6.6 October 23h 2017 **
92100
- Update to Bootstrap 4 Beta 2
93101
- Moving hamburger icon to the right by default
94-
- Fixing issue #392
102+
- Fixing issue #392
95103
- Gramma and typo fixes
96104
- Making inc/security.php hookable
97105
- Variable product ajax_add_to_cart fix
98106
- Update Woocommerce 3.2.1 compatibility
99-
107+
100108

101109
- ** Release 0.6.5 August 17h 2017 **
102110
- Hot fix release
@@ -149,20 +157,20 @@
149157
- ** Release 0.5.7 Feb. 13th 2017 **
150158
- Fixing WooCommerce base layout by reverting custom woocommerce integration and switch back to default integration
151159
- Adding /js/ folder to watcher task excluding theme.js and theme.min.js
152-
- Removing duplicate DIV from "both-sidebars" page template - Thx @evandiamond
160+
- Removing duplicate DIV from "both-sidebars" page template - Thx @evandiamond
153161
- Fixing sidebar check
154162
- Remove customizer from theme.min.js
155-
163+
156164

157165
- ** Release 0.5.6 (skipping 0.5.5) Feb. 9th 2017 **
158-
- Adding automated tests - thx @carl-alberto
166+
- Adding automated tests - thx @carl-alberto
159167
- Remove custom Bootstrap gellery completely
160168
- Fixing typos - thx to @catgofire
161169
- Checking for WP coding standards
162170
- Adding a "dist-product" gulp task
163-
- Adding WooCommerce form-checkout.php - thx @stef-k
164-
- Fixing bug #240 - thx @arpage
165-
- Adding AJAX classes to add-to-cart buttons - thx @typeplus
171+
- Adding WooCommerce form-checkout.php - thx @stef-k
172+
- Fixing bug #240 - thx @arpage
173+
- Adding AJAX classes to add-to-cart buttons - thx @typeplus
166174
- Updating Jetpack integration
167175
- Fixing "missing" h1 on frontpage problem
168176
- Updating inc/template-tags.php from _s
@@ -236,7 +244,7 @@
236244
- Fixing "Gulp dist" Task
237245
- Adding masonry layout option to optimizer - Thx @stef-k
238246
- Adding fluid/fixed conatiner option to optimizer
239-
247+
240248

241249
- ** 0.4.9 Oct. 25th 2016 **
242250
- Updating to Bootstrap 4 Alpha 5

author.php

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -26,39 +26,45 @@
2626
echo get_avatar( $curauth->ID );
2727
endif; ?>
2828
<?php if ( ! empty( $curauth->user_url ) || ! empty( $curauth->user_description ) ) : ?>
29-
<dl>
30-
<?php if ( ! empty( $curauth->user_url ) ) : ?>
31-
<dt><?php esc_html_e( 'Website', 'spurs' ); ?></dt>
32-
<dd>
33-
<a href="<?php echo esc_url( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
34-
</dd>
35-
<?php endif; ?>
29+
<dl>
30+
<?php if ( ! empty( $curauth->user_url ) ) : ?>
31+
<dt><?php esc_html_e( 'Website', 'spurs' ); ?></dt>
32+
<dd>
33+
<a href="<?php echo esc_url( $curauth->user_url ); ?>"><?php echo esc_html( $curauth->user_url ); ?></a>
34+
</dd>
35+
<?php endif; ?>
3636

37-
<?php if ( ! empty( $curauth->user_description ) ) : ?>
38-
<dt><?php esc_html_e( 'Profile', 'spurs' ); ?></dt>
39-
<dd><?php echo esc_html( $curauth->user_description ); ?></dd>
40-
<?php endif; ?>
41-
</dl>
37+
<?php if ( ! empty( $curauth->user_description ) ) : ?>
38+
<dt><?php esc_html_e( 'Profile', 'spurs' ); ?></dt>
39+
<dd><?php echo esc_html_e( $curauth->user_description ); ?></dd>
40+
<?php endif; ?>
41+
</dl>
4242
<?php endif; ?>
4343
<h2><?php esc_html_e( 'Posts by', 'spurs' ); ?> <?php echo esc_html( $curauth->nickname ); ?>:</h2>
4444

4545
</header><!-- .page-header -->
4646

4747
<ul>
4848
<!-- The Loop -->
49-
<?php if ( have_posts() ) {
49+
<?php if ( have_posts() ) :
5050
while ( have_posts() ) : the_post(); ?>
5151
<li>
52-
<a rel="bookmark" href="<?php the_permalink() ?>"
53-
title="<?php esc_html_e( 'Permanent Link:', 'spurs' ); ?> <?php the_title(); ?>">
54-
<?php the_title(); ?></a>,
55-
<?php spurs_posted_on(); ?> <?php esc_html_e( 'in',
56-
'spurs' ); ?> <?php the_category( '&' ); ?>
52+
<?php
53+
printf(
54+
'<a rel="bookmark" href="%1$s" title="%2$s %3$s">%3$s</a>',
55+
esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) ),
56+
esc_attr( __( 'Permanent Link:', 'spurs' ) ),
57+
the_title( '', '', false )
58+
);
59+
spurs_posted_on();
60+
esc_html_e( 'in', 'spurs' );
61+
the_category( '&' );
62+
?>
5763
</li>
5864
<?php endwhile;
59-
} else {
65+
else :
6066
get_template_part( 'templates/loop/content', 'none' );
61-
} ?>
67+
endif; ?>
6268
<!-- End Loop -->
6369
</ul>
6470

bower.json

Lines changed: 0 additions & 31 deletions
This file was deleted.

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
},
1818
"require-dev": {
1919
"dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
20-
"wp-coding-standards/wpcs": "^2.1.1",
21-
"phpcompatibility/php-compatibility": "^9.3.2"
20+
"wp-coding-standards/wpcs": "^2.2.0",
21+
"phpcompatibility/php-compatibility": "^9.3.4"
2222
},
2323
"scripts": {
2424
"test": [

composer.lock

Lines changed: 20 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)