Skip to content

Commit fe7dd11

Browse files
jamesros161jamesros161
authored
Branch 2.17.1 (#747)
* update version numbers * resolves #620 (#746) * resolves #721 (#745) * Issues 738 & 733 (#740) * resolves #738 * Resolves #733 * update Buttons in yarn.lock * generalize btn selectors * update Buttons in yarn.lock * update readme * update readme
1 parent e6dac9b commit fe7dd11

File tree

11 files changed

+43
-44
lines changed

11 files changed

+43
-44
lines changed

‎README.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* **Contributors:** rramo012, timph, jamesros161
99
* **Tags:** inspiration,customization,build,create,design
1010
* **Requires at least:** 4.9
11-
* **Tested up to:** 5.9
11+
* **Tested up to:** 6.1
1212
* **License:** GPL-3.0-or-later
1313
* **License URI:** https://www.gnu.org/licenses/gpl-3.0-standalone.html
1414

@@ -36,6 +36,12 @@ user guide for more information.
3636

3737
## Changelog ##
3838

39+
### 2.17.1 ###
40+
* Bug Fix: (Sprout) Crio doesn't load sa_templates properly [#620](https://github.com/BoldGrid/boldgrid-theme-framework/issues/620)
41+
* Bug Fix: btn-large not consistent between button-primary and button-secondary [#738](https://github.com/BoldGrid/boldgrid-theme-framework/issues/)
42+
* Bug Fix: Footer links inherit site content link hover effect [#733](https://github.com/BoldGrid/boldgrid-theme-framework/issues/733)
43+
* Bug Fix: Add Media modal uses theme fonts & colors without PPB active [#721](https://github.com/BoldGrid/boldgrid-theme-framework/issues/721)
44+
3945
### 2.17.0 ###
4046
* New Feature: Allow Post featured image to link to post single page [#399](https://github.com/BoldGrid/boldgrid-theme-framework/issues/399)
4147
* Bug Fix: Fix Build Dependancies [#734](https://github.com/BoldGrid/boldgrid-theme-framework/issues/734)

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "boldgrid-theme-framework",
3-
"version": "2.17.0",
3+
"version": "2.17.1",
44
"description": "BoldGrid Theme Framework",
55
"main": "index.js",
66
"engines": {

‎src/assets/js/customizer/controls.js‎

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,13 @@
55
* @param $
66
*/
77
( function( $ ) {
8-
var refreshEvent = $.Event( 'boldgrid_customizer_refresh' ),
9-
$body = $( 'body' ),
10-
$themeControls = $( '#customize-theme-controls' );
11-
$window = $( window );
8+
var refreshEvent = $.Event( 'boldgrid_customizer_refresh' ),
9+
$body = $( 'body' ),
10+
$themeControls = $( '#customize-theme-controls' ),
11+
$window = $( window );
1212

1313
$window.on( 'message', function( e ) {
14-
var message,
15-
event = e.originalEvent;
16-
17-
// Ensure we have a string that's JSON.parse-able.
18-
if ( 'string' !== typeof event.data || '{' !== event.data[0] ) {
19-
return;
20-
}
21-
22-
message = JSON.parse( event.data );
23-
if ( 'synced' === message.id ) {
24-
$window.trigger( refreshEvent, message );
25-
}
14+
$window.trigger( refreshEvent, e.originalEvent.data );
2615
} );
2716

2817
// Prevent interaction with panels until Customizer fully loads.

‎src/assets/js/customizer/widget-preview.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ BOLDGRID.CUSTOMIZER = BOLDGRID.CUSTOMIZER || {};
1212
self.hover_bound = false;
1313
self.section_click_bound = false;
1414
$( function() {
15-
$window.on( 'boldgrid_customizer_refresh', onload );
15+
$( window ).on( 'boldgrid_customizer_refresh', onload );
1616
} );
1717

1818
onload = function() {

‎src/assets/scss/boldgrid/_buttons.scss‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
@if variable-exists( button-secondary-classes ) {
1717
.button-secondary,
18+
*:not( .menu-item ) > .button-secondary,
1819
.woocommerce .alt.button {
1920
.palette-primary & {
2021
@extend #{$button-secondary-classes};

‎src/assets/scss/boldgrid/_elements.scss‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,17 @@ blockquote {
7474
}
7575

7676
/* Support for button wrapping classes. */
77-
.main {
78-
.btn,
79-
.button-primary,
80-
.button-secondary {
81-
white-space: normal;
82-
height: unset !important;
83-
&:not( .btn-small ):not( .btn-tiny ) {
84-
min-height: 40px;
85-
}
86-
&:hover,
87-
&:focus {
88-
text-decoration: none;
89-
}
77+
.btn,
78+
.button-primary,
79+
.button-secondary {
80+
white-space: normal;
81+
height: unset !important;
82+
&:not( .btn-small ):not( .btn-tiny ) {
83+
min-height: 40px;
84+
}
85+
&:hover,
86+
&:focus {
87+
text-decoration: none;
9088
}
9189
}
9290

‎src/assets/scss/custom-color/color-classes.scss‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -102,20 +102,20 @@ $names: background background-color;
102102
@for $each from 1 through length( $colors ) {
103103
$reference: nth($colors, $color);
104104
&.color-#{$each}-link-color {
105-
a {
105+
a:not( .btn ) {
106106
color: #{nth($colors, $each)};
107107
}
108-
a:hover, a:focus, a:active, a.highlighted {
108+
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
109109
color: hover( nth($colors, $color), nth($colors, $each) );
110110
}
111111
}
112112
}
113113
@if variable-exists( palette-primary-neutral-color ) {
114114
&.color-neutral-link-color {
115-
a {
115+
a:not( .btn ) {
116116
color: $palette-primary-neutral-color;
117117
}
118-
a:hover, a:focus, a:active, a.highlighted {
118+
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
119119
color: hover( nth($colors, $color), $palette-primary-neutral-color );
120120
}
121121
}
@@ -147,19 +147,19 @@ $names: background background-color;
147147
.color#{$color}-#{nth( $names, $i )} {
148148
@for $each from 1 through length( $colors ) {
149149
&.color-#{$each}-link-color {
150-
a {
150+
a:not( .btn ) {
151151
color: #{nth($colors, $each)};
152152
}
153-
a:hover, a:focus, a:active, a.highlighted {
153+
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
154154
color: hover( nth($colors, $color), nth($colors, $each) );
155155
}
156156
}
157157
&.sidebar {
158158
&.color-#{$each}-link-color {
159-
a {
159+
a:not( .btn ) {
160160
color: #{nth($colors, $each)};
161161
}
162-
a:hover, a:focus, a:active, a.highlighted {
162+
a:not( .btn ):hover, a:not( .btn ):focus, a:not( .btn ):active, a:not( .btn ).highlighted {
163163
color: hover( nth($colors, $color), nth($colors, $each) );
164164
}
165165
}

‎src/assets/scss/editor.scss‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
/** Set Gutenberg metabox styles **/
22
.js.block-editor-page {
33

4+
h1, h2, h3, h4, h5, h6 {
5+
font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif;
6+
color: #3c434a;
7+
}
8+
49
#bgtfw-attributes-meta-box.postbox {
510

611
.handlediv {

‎src/boldgrid-theme-framework.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: BoldGrid Theme Framework
44
* Plugin URI: https://www.boldgrid.com/docs/configuration-file
55
* Description: BoldGrid Theme Framework is a library that allows you to easily make BoldGrid themes. Please see our reference guide for more information: https://www.boldgrid.com/docs/configuration-file
6-
* Version: 2.17.0-rc1
6+
* Version: 2.17.1
77
* Author: BoldGrid.com <[email protected]>
88
* Author URI: https://www.boldgrid.com/
99
* Text Domain: bgtfw

‎src/includes/class-boldgrid-framework-links.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ public function get_styles( $prefix ) {
168168
$footer_lightness = max( $footer_lightness, 0 );
169169
$footer_color_hover = $footer_ari_color->getNew( 'lightness', $footer_lightness )->toCSS( 'hsla' );
170170

171-
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a { text-decoration: ${decoration};}";
172-
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
171+
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ) { text-decoration: ${decoration};}";
172+
$css .= "#colophon .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):hover, .bgtfw-footer.footer-content *:not( .menu-item ) > a:not( .btn ):focus {color: ${footer_color_hover};text-decoration: ${decoration_hover};}";
173173
}
174174
}
175175
}

0 commit comments

Comments
 (0)