Merge pull request #167 from dshanske/june21refresh

Icon Refresh

Author: dshanske

Gruntfile.js

@@ -1,5 +1,4 @@
 module.exports = function (grunt) {
-const sass = require('node-sass');
 // Project configuration.
   grunt.initConfig({
     execute: {
@@ -57,25 +56,23 @@ const sass = require('node-sass');
         }
       }
     },
-    sass: { 
-    	options: {
-		implementation: sass,
-		sourceMap: true,
-		outputStyle: 'compressed'
-      },
-      // Task
-      dist: {                            // Target
-        files: {                         // Dictionary of files
-          'static/css/indieweb.css': 'sass/main.scss',       // 'destination': 'source'
-          'static/css/indieweb-bw.css': 'sass/main-bw.scss',
-          'static/css/indieweb-admin.css': 'sass/main-admin.scss'
-        }
-      }
-    }
+	sass                 : { // Task.
+				dist: { // Target.
+					options: { // Target options.
+						style: 'compressed'
+					},
+					files  : { // Dictionary of files.
+
+          					'static/css/indieweb.css': 'sass/main.scss',       // 'destination': 'source'
+					        'static/css/indieweb-bw.css': 'sass/main-bw.scss',
+					        'static/css/indieweb-admin.css': 'sass/main-admin.scss'
+					}
+				}
+			}
  });
 
   grunt.loadNpmTasks('grunt-wp-readme-to-markdown');
-  grunt.loadNpmTasks('grunt-sass');
+  grunt.loadNpmTasks('grunt-contrib-sass');
   grunt.loadNpmTasks('grunt-checktextdomain');
   grunt.loadNpmTasks('grunt-execute');
   grunt.loadNpmTasks('grunt-contrib-copy');

includes/class-relme-domain-icon-map.php

@@ -62,7 +62,7 @@ public static function get_icon( $name ) {
 		$icon  = self::get_icon_svg( $name );
 		$title = self::get_title( $name );
 		if ( $icon ) {
-			return sprintf( '<span class="svg-icon svg-%1$s" aria-hidden="true" aria-label="%2$s" title="%2$s" >%3$s</span>', esc_attr( $name ), esc_attr( $title ), $icon );
+			return sprintf( '<span class="relme-icon svg-%1$s" aria-hidden="true" aria-label="%2$s" title="%2$s" >%3$s</span>', esc_attr( $name ), esc_attr( $title ), $icon );
 		}
 		return $name;
 	}

includes/simple-icons.php

@@ -5,7 +5,7 @@
  * Description: Interested in connecting your WordPress site to the IndieWeb?
  * Author: IndieWebCamp WordPress Outreach Club
  * Author URI: https://indieweb.org/WordPress_Outreach_Club
- * Version: 3.4.4
+ * Version: 3.4.5
  * License: MIT
  * License URI: http://opensource.org/licenses/MIT
  * Text Domain: indieweb
@@ -26,7 +26,7 @@
  */
 class IndieWeb_Plugin {
 
-	public static $version = '3.4.4';
+	public static $version = '3.4.5';
 
 	/**
 	 * Initialize the plugin, registering WordPress hooks.

indieweb.php

@@ -1,17 +1,17 @@
-# Copyright (C) 2020 IndieWebCamp WordPress Outreach Club
+# Copyright (C) 2021 IndieWebCamp WordPress Outreach Club
 # This file is distributed under the MIT.
 msgid ""
 msgstr ""
-"Project-Id-Version: IndieWeb 3.4.3\n"
+"Project-Id-Version: IndieWeb 3.4.5\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/wordpress-indieweb\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"POT-Creation-Date: 2020-08-16T01:20:48+00:00\n"
+"POT-Creation-Date: 2021-06-12T15:40:56+00:00\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"X-Generator: WP-CLI 2.4.0\n"
+"X-Generator: WP-CLI 2.5.0\n"
 "X-Domain: indieweb\n"
 
 #. Plugin Name of the plugin

languages/wordpress-indieweb.pot

@@ -11,14 +11,13 @@
   },
   "devDependencies": {
     "genericons-neue": "^4.0.5",
-    "grunt": "^1.3.0",
+    "grunt": "^1.4.1",
     "grunt-checktextdomain": "^1.0.1",
     "grunt-contrib-copy": "^1.0.0",
+    "grunt-contrib-sass": "^2.0.0",
     "grunt-execute": "^0.2.2",
-    "grunt-sass": "^3.1.0",
     "grunt-wp-readme-to-markdown": "~2.0.1",
-    "node-sass": "^4.14.1",
-    "simple-icons": "^4.2.0"
+    "simple-icons": "^4.25.0"
   },
   "license": "MIT",
   "bugs": {

package.json

@@ -4,8 +4,8 @@
 **Tags:** indieweb, webmention, POSSE, indieauth  
 **Requires at least:** 4.7  
 **Requires PHP:** 5.6  
-**Tested up to:** 5.6  
-**Stable tag:** 3.4.4  
+**Tested up to:** 5.7.2  
+**Stable tag:** 3.4.5  
 **License:** MIT  
 **License URI:** http://opensource.org/licenses/MIT  
 
@@ -82,6 +82,11 @@ One could certainly download, install, and activate some or all of these plugins
 
 Project maintained on github at [indieweb/wordpress-indieweb](https://github.com/indieweb/wordpress-indieweb).
 
+### 3.4.5 ###
+* Refresh dependencies
+* Refresh icons
+* Fix issue with CSS name collision causing black icons to turn green.
+
 ### 3.4.4 ###
 * Refresh dependencies
 

readme.md

@@ -4,8 +4,8 @@ Donate link: https://indieweb.org/how-to-sponsor
 Tags: indieweb, webmention, POSSE, indieauth
 Requires at least: 4.7
 Requires PHP: 5.6
-Tested up to: 5.6
-Stable tag: 3.4.4
+Tested up to: 5.7.2
+Stable tag: 3.4.5
 License: MIT
 License URI: http://opensource.org/licenses/MIT
 
@@ -82,6 +82,11 @@ One could certainly download, install, and activate some or all of these plugins
 
 Project maintained on github at [indieweb/wordpress-indieweb](https://github.com/indieweb/wordpress-indieweb).
 
+= 3.4.5 =
+* Refresh dependencies
+* Refresh icons
+* Fix issue with CSS name collision causing black icons to turn green.
+
 = 3.4.4 =
 * Refresh dependencies
 

readme.txt

@@ -1,4 +1,4 @@
-.svg-icon {
+.relme-icon {
 	svg {
 		fill: currentColor;
 		vertical-align: middle;