Skip to content

Commit

Permalink
Merging origin master with local.
Browse files Browse the repository at this point in the history
  • Loading branch information
cdils committed Nov 26, 2017
2 parents 8c29af1 + 2425745 commit 2eb39ed
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 19 deletions.
14 changes: 2 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,8 @@

All notable changes to this project will be documented in this file.

## 2.0.0 - 2017-??-??
- Make PHP 7.0 the minimum supported version.
- Declare strict types, and use scalar and return type hints.
- Use config-driven approach - see `config/defaults.php`.
- Rewrite customizations logic as object-orientated code.
- Add unit tests for all the customizations.
- Update TGMPA to 2.6.1.
- Pull in TGMPA via Composer.
- Change how scripts are named and organized.
- Use Gulp WP Tookit as the build system base.
- Add Contributor Covenant Code of Conduct.
- Update `.pot` file for translations.
## 1.3.2 - 2017-09-06
- Fixed name discrepancies in localized property names for the responsive menu.

## 1.3.1 - 2016-04-11
- Fix incorrect script handle on backstretch arguments.
Expand Down
1 change: 1 addition & 0 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "utility-pro",
"version": "1.3.2",
"homepage": "https://github.com/cdils/utility-pro",
"authors": [
"Carrie Dils <[email protected]>"
Expand Down
12 changes: 6 additions & 6 deletions develop/scss/partials/_theme-colors.scss
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-purple .call-to-action-bar .button,
.utility-pro-purple .button,
.utility-pro-purple .entry-content .button,
.utility-pro-purple .entry-content a.button,
.utility-pro-purple input[type="submit"] {
background: $purple;
border: 1px solid $white;
Expand All @@ -27,7 +27,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-purple .call-to-action-bar .button:hover,
.utility-pro-purple .button:hover,
.utility-pro-purple .entry-content .button:hover,
.utility-pro-purple .entry-content a.button:hover,
.utility-pro-purple input[type="submit"]:hover {
background: $white;
border: 1px solid $purple;
Expand All @@ -54,7 +54,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-green .call-to-action-bar .button,
.utility-pro-green .button,
.utility-pro-green .entry-content .button,
.utility-pro-green a.button,
.utility-pro-green input[type="submit"] {
background: $green;
border: 1px solid $white;
Expand All @@ -63,7 +63,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-green .call-to-action-bar .button:hover,
.utility-pro-green .button:hover,
.utility-pro-green .entry-content .button:hover,
.utility-pro-green .entry-content a.button:hover,
.utility-pro-green input[type="submit"]:hover {
background: $white;
border: 1px solid $green;
Expand All @@ -90,7 +90,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-red .call-to-action-bar .button,
.utility-pro-red .button,
.utility-pro-red .entry-content .button,
.utility-pro-red a.button,
.utility-pro-red input[type="submit"] {
background: $red;
border: 1px solid $white;
Expand All @@ -99,7 +99,7 @@ If you've chosen your favorite color scheme, you can delete the others

.utility-pro-red .call-to-action-bar .button:hover,
.utility-pro-red .button:hover,
.utility-pro-red .entry-content .button:hover,
.utility-pro-red .entry-content a.button:hover,
.utility-pro-red input[type="submit"]:hover {
background: $white;
border: 1px solid $red;
Expand Down
12 changes: 12 additions & 0 deletions develop/scss/style.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
/* #
Theme Name: Utility Pro
Description: No-nonsense, functional child theme created for the Genesis Framework.
Author: Carrie Dils
Author URI: http://www.carriedils.com/
Version: 1.3.2
Tags: black, purple, green, blue, red, one-column, two-columns, fixed-width, custom-menu, full-width-template, sticky-post, theme-options, threaded-comments, rtl-language-support, translation-ready
Template: genesis
License: GPL-2.0+
License URI: http://www.opensource.org/licenses/gpl-license.php
Text Domain: utility-pro
*/

/* # Table of Contents
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "utility-pro",
"version": "1.3.1",
"version": "1.3.2",
"description": "Utility Pro is a child theme for the Genesis Framework.",
"homepage": "https://store.carriedils.com/downloads/utility-pro/",
"keywords": [
Expand Down

0 comments on commit 2eb39ed

Please sign in to comment.