Skip to content

Commit fb9eed3

Browse files
committed
Merge branch 'dev' of github.com:BoldGrid/boldgrid-theme-framework
2 parents 78791f6 + f09794b commit fb9eed3

39 files changed

+1311
-717
lines changed

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BoldGrid Theme Framework #
22

3-
[![Build Status](https://travis-ci.org/BoldGrid/boldgrid-theme-framework.svg?branch=dev)](https://travis-ci.org/BoldGrid/boldgrid-theme-framework) [![License](https://img.shields.io/badge/license-GPL--2.0%2B-orange.svg)](https://raw.githubusercontent.com/BoldGrid/boldgrid-theme-framework/master/LICENSE)
3+
[![Build Status](https://travis-ci.org/BoldGrid/boldgrid-theme-framework.svg?branch=dev)](https://travis-ci.org/BoldGrid/boldgrid-theme-framework) [![License](https://img.shields.io/badge/license-GPL--2.0%2B-orange.svg)](https://raw.githubusercontent.com/BoldGrid/boldgrid-theme-framework/master/LICENSE) [![Code Climate](https://codeclimate.com/github/BoldGrid/boldgrid-theme-framework/badges/gpa.svg)](https://codeclimate.com/github/BoldGrid/boldgrid-theme-framework)
44

55
* **Contributors:** rramo012, timph
66
* **Tags:** inspiration,customization,build,create,design
@@ -23,6 +23,13 @@ user guide for more information.
2323

2424
## Changelog ##
2525

26+
### 1.1.1 ###
27+
* New Feature: Child themes can now be created and work properly.
28+
* Misc: Replaced Underscore's accessibility classes with Bootstrap's.
29+
* New Feature: Added support for using heading classes that work with typography controls.
30+
* Misc: Code refactor of activate class.
31+
* Misc: Added CodeClimate Configuration.
32+
2633
### 1.1 ###
2734
* Bug fix: Animate.css now can load properly.
2835
* Bug fix: Allow child themes to use their own background images.

boldgrid-theme-framework/README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# BoldGrid Theme Framework #
22

3-
[![Build Status](https://travis-ci.org/BoldGrid/boldgrid-theme-framework.svg?branch=dev)](https://travis-ci.org/BoldGrid/boldgrid-theme-framework) [![License](https://img.shields.io/badge/license-GPL--2.0%2B-orange.svg)](https://raw.githubusercontent.com/BoldGrid/boldgrid-theme-framework/master/LICENSE)
3+
[![Build Status](https://travis-ci.org/BoldGrid/boldgrid-theme-framework.svg?branch=dev)](https://travis-ci.org/BoldGrid/boldgrid-theme-framework) [![License](https://img.shields.io/badge/license-GPL--2.0%2B-orange.svg)](https://raw.githubusercontent.com/BoldGrid/boldgrid-theme-framework/master/LICENSE) [![Code Climate](https://codeclimate.com/github/BoldGrid/boldgrid-theme-framework/badges/gpa.svg)](https://codeclimate.com/github/BoldGrid/boldgrid-theme-framework)
44

55
* **Contributors:** rramo012, timph
66
* **Tags:** inspiration,customization,build,create,design
@@ -23,6 +23,13 @@ user guide for more information.
2323

2424
## Changelog ##
2525

26+
### 1.1.1 ###
27+
* New Feature: Child themes can now be created and work properly.
28+
* Misc: Replaced Underscore's accessibility classes with Bootstrap's.
29+
* New Feature: Added support for using heading classes that work with typography controls.
30+
* Misc: Code refactor of activate class.
31+
* Misc: Added CodeClimate Configuration.
32+
2633
### 1.1 ###
2734
* Bug fix: Animate.css now can load properly.
2835
* Bug fix: Allow child themes to use their own background images.

boldgrid-theme-framework/assets/js/customizer/typography-controls.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
var hide_nav_controls = function () {
3636
var $menus = wp.customize.section( 'menu_locations' ).controls();
3737
// Check all registered menu locations.
38-
$menus.forEach( function( id ) {
38+
_.each( $menus, function( id ) {
3939
// Deactivate all controls initially
4040
wp.customize.control( 'navigation_' + id.themeLocation +'_font_size' ).deactivate({ duration: 0 });
4141
wp.customize.control( 'navigation_' + id.themeLocation +'_font_family' ).deactivate({ duration: 0 });

boldgrid-theme-framework/assets/js/customizer/typography-controls.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

boldgrid-theme-framework/assets/js/customizer/typography-preview.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
var $menus = parent.wp.customize.section( 'menu_locations' ).controls();
1313

1414
// Loop through nav menus for live preview changes.
15-
$menus.forEach( function( id ) {
15+
_.each( $menus, function( id ) {
1616

1717
// Set menu location font size's for live previews without refreshes
1818
wp.customize( 'navigation_' + id.themeLocation +'_font_size', function( value ) {
@@ -40,17 +40,17 @@
4040
// Set font-size of headings live
4141
wp.customize( 'headings_font_size', function( value ) {
4242
value.bind( function( to ) {
43-
$( 'h1:not( .site-title, .alt-font )' )
43+
$( 'h1:not( .site-title, .alt-font ), .h1' )
4444
.css( 'font-size', Math.floor( to * 2.6 ) + 'px' );
45-
$( 'h2:not( .alt-font )' )
45+
$( 'h2:not( .alt-font ), .h2' )
4646
.css( 'font-size', Math.floor( to * 2.15 ) + 'px' );
47-
$( 'h3:not( .alt-font, .site-description )' )
47+
$( 'h3:not( .alt-font, .site-description ), .h3' )
4848
.css( 'font-size', Math.ceil( to * 1.7 ) + 'px' );
49-
$( 'h4:not( .alt-font )' )
49+
$( 'h4:not( .alt-font ), .h4' )
5050
.css( 'font-size', Math.ceil( to * 1.25 ) + 'px' );
51-
$( 'h5:not( .alt-font )' )
51+
$( 'h5:not( .alt-font ), .h5' )
5252
.css( 'font-size', to + 'px' );
53-
$( 'h6:not( .alt-font )' )
53+
$( 'h6:not( .alt-font ), .h6' )
5454
.css( 'font-size', Math.ceil( to * 0.85 ) + 'px' );
5555
});
5656
});
@@ -65,17 +65,17 @@
6565
// Set font-size of headings live
6666
wp.customize( 'alternate_headings_font_size', function( value ) {
6767
value.bind( function( to ) {
68-
$( 'h1.alt-font' )
68+
$( 'h1.alt-font, .h1.alt-font' )
6969
.css( 'font-size', Math.floor( to * 2.6 ) + 'px' );
70-
$( 'h2.alt-font' )
70+
$( 'h2.alt-font, .h2.alt-font' )
7171
.css( 'font-size', Math.floor( to * 2.15 ) + 'px' );
72-
$( 'h3.alt-font' )
72+
$( 'h3.alt-font, .h3.alt-font' )
7373
.css( 'font-size', Math.ceil( to * 1.7 ) + 'px' );
74-
$( 'h4.alt-font' )
74+
$( 'h4.alt-font, .h4.alt-font' )
7575
.css( 'font-size', Math.ceil( to * 1.25 ) + 'px' );
76-
$( 'h5.alt-font' )
76+
$( 'h5.alt-font, .h5.alt-font' )
7777
.css( 'font-size', to + 'px' );
78-
$( 'h6.alt-font' )
78+
$( 'h6.alt-font, .h6.alt-font' )
7979
.css( 'font-size', Math.ceil( to * 0.85 ) + 'px' );
8080
});
8181
});

boldgrid-theme-framework/assets/js/customizer/typography-preview.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)