Merge pull request #88 from jazzsequence/dev

Version bump

functions.php

@@ -82,13 +82,13 @@ function ap_core_load_scripts() {
         wp_register_script('modernizr',get_template_directory_uri() . '/assets/js/modernizr-2.5.3.min.js',false,'2.5.3');
         wp_enqueue_script('modernizr');
         // register fonts
-        wp_register_style('droidsans','http://fonts.googleapis.com/css?family=Droid+Sans&subset=' . $font_subset,false,$theme['Version']);
-        wp_register_style('ptserif','http://fonts.googleapis.com/css?family=PT+Serif&subset=' . $font_subset,false,$theme['Version']);
-        wp_register_style('inconsolata','http://fonts.googleapis.com/css?family=Inconsolata&subset=' . $font_subset,false,$theme['Version']);
-        wp_register_style('ubuntu','http://fonts.googleapis.com/css?family=Ubuntu&subset=' . $font_subset,false,$theme['Version']);
-        wp_register_style('lato','http://fonts.googleapis.com/css?family=Lato&subset=' . $font_subset,false,$theme['Version'] );
-        wp_register_style( 'notoserif','http://fonts.googleapis.com/css?family=Noto+Serif&subset=' . $font_subset,false, $theme['Version']  );
-        wp_register_style( 'opensans', 'http://fonts.googleapis.com/css?family=Open+Sans&subset=' . $font_subset, false, $theme['Version'] );
+        wp_register_style('droidsans','//fonts.googleapis.com/css?family=Droid+Sans&subset=' . $font_subset,false,$theme['Version']);
+        wp_register_style('ptserif','//fonts.googleapis.com/css?family=PT+Serif&subset=' . $font_subset,false,$theme['Version']);
+        wp_register_style('inconsolata','//fonts.googleapis.com/css?family=Inconsolata&subset=' . $font_subset,false,$theme['Version']);
+        wp_register_style('ubuntu','//fonts.googleapis.com/css?family=Ubuntu&subset=' . $font_subset,false,$theme['Version']);
+        wp_register_style('lato','//fonts.googleapis.com/css?family=Lato&subset=' . $font_subset,false,$theme['Version'] );
+        wp_register_style( 'notoserif','//fonts.googleapis.com/css?family=Noto+Serif&subset=' . $font_subset,false, $theme['Version']  );
+        wp_register_style( 'opensans', '//fonts.googleapis.com/css?family=Open+Sans&subset=' . $font_subset, false, $theme['Version'] );
         // only enqueue fonts that are actually being used
         $heading = ( isset( $options['heading'] ) ) ? $options['heading'] : $defaults['heading'];
         $body = ( isset( $options['body'] ) ) ? $options['body'] : $defaults['body'];
@@ -803,7 +803,7 @@ function ap_core_custom_styles() {
             $link = sanitize_text_field($options['link']);
             $output_link = "a, a:link, a:visited { color: $link; -webkit-transition: all 0.3s ease!important; -moz-transition: all 0.3s ease!important; -o-transition: all 0.3s ease!important; transition: all  0.3s ease!important; }";
         }
-        if ( isset( $options['hover'] ) && $options['hover'] !== $defaults['hover'] || isset( $options['link'] ) ) {
+        if ( isset( $options['hover'] ) && $options['hover'] !== $defaults['hover'] || isset( $options['hover'] ) && isset( $options['link'] ) ) {
             $hover = sanitize_text_field($options['hover']);
             $output_hover = "a:hover, a:active { color: $hover; -webkit-transition: all 0.3s ease!important; -moz-transition: all 0.3s ease!important; -o-transition: all 0.3s ease!important; transition: all  0.3s ease!important; }";
         }

readme.md

@@ -3,8 +3,8 @@ Contributors: [jazzsequence](https://github.com/jazzsequence)
 Donate link: https://www.paypal.me/jazzsequence/  
 Tags: two-columns, custom-menu, threaded-comments, sticky-post, custom-background, featured-image-header, featured-images, post-formats, right-sidebar, translation-ready  
 Requires at least: 3.2  
-Tested up to: 4.7  
-Stable tag: 2.1.5
+Tested up to: 4.9.4  
+Stable tag: 2.1.6
 
 A simple, responsive WordPress theme/framework with support for internationalization, post formats, thumbnails, background, header, menus, custom favicon and more...
 
@@ -16,8 +16,8 @@ Museum Core is a clean, responsive framework with support for built-in WordPress
 * German translation by [Christian Mauderer](http://www.c-mauderer.de/)
 * Spanish translatin by [Wenke Adam](http://guillermodeisler.xyz/)
 
-**Call for translators!**
-If you are interested in helping translate this theme, contact me at hello@chrisreynolds.io.
+**Call for contributors!**  
+If you like this theme and you would like to help maintain it, please get in touch with me on twitter ([@jazzs3quence](https://twitter.com/jazzs3quence)) via email (me@chrisreynolds.io) or on the [GitHub repo](https://github.com/jazzsequence/museum-core) as this is no longer a project that I am actively developing or maintaining.
 
 ## Installation
 
@@ -31,6 +31,11 @@ There are currently no screenshots.
 
 ## Changelog
 
+### Version 2.1.6
+
+* strip 'http:' from font URLs to improve HTTPS support [#86](https://github.com/jazzsequence/museum-core/pull/86)
+* fix a PHP notice when changing link colors [#87](https://github.com/jazzsequence/museum-core/issues/87)
+
 ### Version 2.1.5
 * fixed a bug where sidebar would not load correctly due to using name instead of ID [issue](https://github.com/jazzsequence/museum-core/issues/81)
 * use `add_theme_support( 'title-tag' )` instead of `<title><?php wp_title(); ?></title>`

readme.txt

@@ -3,8 +3,8 @@ Contributors: jazzs3quence
 Donate link: https://www.paypal.me/jazzsequence/
 Tags: two-columns, custom-menu, threaded-comments, sticky-post, custom-background, featured-image-header, featured-images, post-formats, right-sidebar, translation-ready
 Requires at least: 3.2
-Tested up to: 4.7
-Stable tag: 2.1.5
+Tested up to: 4.9.4
+Stable tag: 2.1.6
 
 A simple, responsive WordPress theme/framework with support for internationalization, post formats, thumbnails, background, header, menus, custom favicon and more...
 
@@ -16,8 +16,8 @@ Museum Core is a clean, responsive framework with support for built-in WordPress
 * German translation by [Christian Mauderer](http://www.c-mauderer.de/)
 * Spanish translatin by [Wenke Adam](http://guillermodeisler.xyz/)
 
-**Call for translators!**
-If you are interested in helping translate this theme, contact me at hello@chrisreynolds.io.
+**Call for contributors!**
+If you like this theme and you would like to help maintain it, please get in touch with me on twitter ([@jazzs3quence](https://twitter.com/jazzs3quence)) via email (me@chrisreynolds.io) or on the [GitHub repo](https://github.com/jazzsequence/museum-core) as this is no longer a project that I am actively developing or maintaining.
 
 == Installation ==
 
@@ -31,6 +31,11 @@ There are currently no screenshots.
 
 == Changelog ==
 
+= Version 2.1.6 =
+
+* strip 'http:' from font URLs to improve HTTPS support [#86](https://github.com/jazzsequence/museum-core/pull/86)
+* fix a PHP notice when changing link colors [#87](https://github.com/jazzsequence/museum-core/issues/87)
+
 = Version 2.1.5 =
 
 * fixed a bug where sidebar would not load correctly due to using name instead of ID [issue](https://github.com/jazzsequence/museum-core/issues/81) 

style.css

@@ -2,7 +2,7 @@
 Theme Name: Museum Core
 Theme URI: https://github.com/jazzsequence/museum-core
 Description: A simple WordPress theme/framework with support for post formats, thumbnails, background, header, menus and more...
-Version: 2.1.5
+Version: 2.1.6
 Author: Chris Reynolds
 Author URI: https://www.jazzsequence.com
 License: GNU General Public License v3.0