2.2.27

quantazelle · Feb 10, 2015 · a2b0877 · a2b0877
1 parent dd0f0e4
commit a2b0877
Show file tree

Hide file tree

Showing 19 changed files with 286 additions and 302 deletions.
diff --git a/.csscomb.json b/.csscomb.json
diff --git a/README.md b/README.md
@@ -134,6 +134,12 @@ grunt
 - *(Ongoing)* More standard developer comments & better function formatting
 
 ## Changelog
+### 2.2.27 (February 10, 2015)
+- Add `csscomb.js` to `package.json`. I would love to integrate combing into Grunt `watch`, but I can't figure out a friendly way run it on `.scss` files that I'm currently editing. For now, it can be run on the command line with `csscomb sass`.
+- Modify `.csscomb.json` to work with `csscomb.js`
+- Run `csscomb.js` on `sass/*`
+- `return` `bfg_admin_footer_text()`, since it's a filter
+
 ### 2.2.26 (January 26, 2015)
 - Add `jquery.cookie.js`
 - Automatically remove `readme.html` (and optionally `xmlrpc.php`) after a WP core update

diff --git a/functions.php b/functions.php
@@ -8,7 +8,7 @@
 // Child theme definitions
 define( 'CHILD_THEME_NAME', 'Bones for Genesis 2.0' );
 define( 'CHILD_THEME_URL', 'http://bonesforgenesis.com/' );
-define( 'CHILD_THEME_VERSION', '2.2.26' );
+define( 'CHILD_THEME_VERSION', '2.2.27' );
 
 // Developer Tools
 require_once( CHILD_DIR . '/includes/developer-tools.php' );		// DO NOT USE THESE ON A LIVE SITE

diff --git a/includes/admin/admin-branding.php b/includes/admin/admin-branding.php
@@ -129,8 +129,8 @@ function bfg_remove_wp_icon_from_admin_bar() {
  *
  * @since 2.0.0
  */
-function bfg_admin_footer_text () {
+function bfg_admin_footer_text() {
 
-	echo 'YOUR TEXT HERE.';
+	return 'YOUR TEXT HERE.';
 
 }
diff --git a/package.json b/package.json
@@ -12,6 +12,7 @@
     "grunt-contrib-watch": "*",
     "grunt-csso": "*",
     "grunt-newer": "*",
-    "grunt-notify": "*"
+    "grunt-notify": "*",
+    "csscomb": "*"
   }
 }
diff --git a/sass/_comments.scss b/sass/_comments.scss
@@ -1,7 +1,5 @@
 .comment-list {
-
 	.comment {
-
 		> article {
 		}
 	}
@@ -25,8 +23,6 @@
 }
 
 .comment-respond {
-
-
 	.form-submit {
 		@extend %clearfix;
 	}

diff --git a/sass/_content.scss b/sass/_content.scss
@@ -19,7 +19,6 @@
 }
 
 .entry-content {
-
 	p {
 		@extend %type;
 	}
@@ -37,21 +36,18 @@
 	}
 
 	ol {
-
 		li {
 			list-style-type: decimal;
 		}
 	}
 
 	ul {
-
 		li {
 			list-style-type: disc;
 		}
 	}
 
 	blockquote {
-
 		p {
 		}
 	}
@@ -84,7 +80,6 @@
 		display: inline;
 
 		a {
-
 			&:hover,
 			&:focus,
 			&:active {
@@ -95,7 +90,6 @@
 		}
 
 		&.active {
-
 			a {
 			}
 		}

diff --git a/sass/_footer.scss b/sass/_footer.scss
@@ -12,7 +12,6 @@
 }
 
 .site-footer {
-
 	> .wrap {
 	}
 }
diff --git a/sass/_forms.scss b/sass/_forms.scss
@@ -61,7 +61,6 @@ input[type='search'] {
 }
 
 .gform_wrapper {
-
 	.gform_ajax_spinner {
 		display: none !important;
 	}
@@ -86,14 +85,12 @@ input[type='search'] {
 }
 
 .search-form {
-
 	input[type='search'] {
 		flex: 1;
 	}
 }
 
 .post-password-form {
-
 	input[type='password'] {
 		flex: 1;
 	}

diff --git a/sass/_header.scss b/sass/_header.scss
@@ -1,5 +1,4 @@
 .site-header {
-
 	> .wrap {
 	}
 }
@@ -23,7 +22,6 @@
 	line-height: 1;
 
 	a {
-
 		&:hover,
 		&:focus,
 		&:active {

diff --git a/sass/_ie.scss b/sass/_ie.scss
@@ -1,12 +1,10 @@
 html {
-
 	&.lt-ie9 {
 		min-width: $siteWidth;
 	}
 }
 
 .lt-ie9 {
-
 	body {
 		min-width: $siteWidth;
 	}

diff --git a/sass/_mixins.scss b/sass/_mixins.scss
@@ -1,5 +1,4 @@
 @keyframes bouncedelay {
-
 	0%,
 	80%,
 	100% {

diff --git a/sass/_navigation.scss b/sass/_navigation.scss
@@ -4,7 +4,6 @@
 
 	// Applied to all menu <li>s
 	.menu-item {
-
 		a {
 			position: relative;
 			display: block;
@@ -21,15 +20,13 @@
 		&:focus,
 		&:active,
 		&.sfHover {
-
 			> .sub-menu {
 				left: auto;
 				opacity: 1;
 			}
 		}
 
 		&.current-menu-item {
-
 			> a {
 			}
 		}
@@ -48,7 +45,6 @@
 		transition: opacity .4s ease-in-out;
 
 		> .menu-item {
-
 			> a {
 				position: relative;
 			}

diff --git a/sass/_print.scss b/sass/_print.scss
@@ -1,5 +1,4 @@
 @media print {
-
 	* {
 		background: transparent !important;
 		filter: none !important;
@@ -52,9 +51,7 @@
 	}
 
 	.site-header {
-
 		.site-title {
-
 			img {
 				display: block;
 				margin: 0 auto 1em;
@@ -68,7 +65,6 @@
 
 	.entry-title,
 	.entry-content {
-
 		a[href]:after {
 			content: ' (' attr(href) ')';
 		}

diff --git a/sass/_sidebars.scss b/sass/_sidebars.scss
@@ -1,5 +1,4 @@
 .sidebar {
-
 	.widget {
 	}
 

diff --git a/sass/_toolkit.scss b/sass/_toolkit.scss
@@ -56,7 +56,6 @@
 }
 
 .no-js {
-
 	.hide-no-js {
 		display: none !important;
 	}

diff --git a/sass/_type.scss b/sass/_type.scss
@@ -23,7 +23,6 @@ textarea:focus,
 }
 
 a {
-
 	&:hover,
 	&:focus,
 	&:active {

diff --git a/sass/_variables.scss b/sass/_variables.scss
@@ -1,28 +1,33 @@
 /*********************
 SIZES
 *********************/
-$siteWidth:		60em; // Useful for fixed width sites, as well as for limiting the max-width of fluid sites
+$siteWidth: 60em; // Useful for fixed width sites, as well as for limiting the max-width of fluid sites
 
 @mixin breakpoint($point) {
 	@if $point == full {
-		@media (min-width: 55em) { @content; }
+		@media (min-width: 55em) {
+			@content;
+		}
 	}
 	@else if $point == tablet {
-		@media (max-width: 55em) { @content; }
+		@media (max-width: 55em) {
+			@content;
+		}
 	}
 	@else if $point == phone {
-		@media (max-width: 45em) { @content; }
+		@media (max-width: 45em) {
+			@content;
+		}
 	}
 	// http://mir.aculo.us/2012/11/28/the-ultimate-target-retina-screens-media-query/
 	@else if $point == retina {
 		@media
-			(min--moz-device-pixel-ratio: 1.5),
-			(-o-min-device-pixel-ratio: 3/2),
-			(-webkit-min-device-pixel-ratio: 1.5),
-			(min-device-pixel-ratio: 1.5),
-			(min-resolution: 144dpi),
-			(min-resolution: 1.5dppx)
-		{
+		(min--moz-device-pixel-ratio: 1.5),
+		(-o-min-device-pixel-ratio: 3/2),
+		(-webkit-min-device-pixel-ratio: 1.5),
+		(min-device-pixel-ratio: 1.5),
+		(min-resolution: 144dpi),
+		(min-resolution: 1.5dppx) {
 			@content;
 		}
 	}
@@ -35,18 +40,18 @@ COLORS
 /*********************
 SOCIAL COLORS - http://designpieces.com/2012/12/social-media-colours-hex-and-rgb/
 *********************/
-$twitter:			#00aced;
-$facebook: 			#3b5998;
-$linkedin:			#007bb6;
-$google:			#dd4b39;
-$youtube:			#bb0000;
-$pinterest: 		#cb2027;
-$tumblr:			#32506d;
-$flickr:			#ff0084;
-$instagram:			#517fa4;
-$vimeo:				#aad450;
-$foursquare: 		#0072b1;
-$rss:				#ff6600;
+$twitter: #00aced;
+$facebook: #3b5998;
+$linkedin: #007bb6;
+$google: #dd4b39;
+$youtube: #b00;
+$pinterest: #cb2027;
+$tumblr: #32506d;
+$flickr: #ff0084;
+$instagram: #517fa4;
+$vimeo: #aad450;
+$foursquare: #0072b1;
+$rss: #f60;
 
 /*********************
 TYPOGRAPHY - http://cssfontstack.com/

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@
 	Description: A starting point for new Genesis 2.0 projects.
 	Author: Cooper Dukes @INNEO
 	Author URI: http://www.inneosg.com/
-	Version: 2.2.26
+	Version: 2.2.27
 
 	Tags: left-sidebar, right-sidebar, flexible-width, custom-menu, editor-style, featured-images, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,6 @@ @@
     }
     .site-footer {
     	> .wrap {
     	}
     }