From 56b7a6439eeeef7f5dbdb267b46e7a5199b58681 Mon Sep 17 00:00:00 2001
From: Mickey Kay <mickey@mickeykaycreative.com>
Date: Fri, 17 Jan 2014 17:08:19 -0800
Subject: [PATCH] Improved/added shortcodes, tweaked CSS

---
 lib/shortcodes/shortcodes.php | 20 ++++++++++++++++----
 style.css                     | 32 ++++++++++++++++++++++++++------
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/lib/shortcodes/shortcodes.php b/lib/shortcodes/shortcodes.php
index 859ce2c..c69f6e8 100644
--- a/lib/shortcodes/shortcodes.php
+++ b/lib/shortcodes/shortcodes.php
@@ -27,17 +27,29 @@ function shortcode_empty_paragraph_fix($content)
 add_filter('the_content', 'shortcode_empty_paragraph_fix');
 
 /**
- * Columns - [col class="one-half first no-list-margin"]
+ * Columns - [col class="one-half first no-list-margin"] Contents [/col]
  *
  * Classes:
  *     - width (one-half, one-third, etc - uses native Genesis column classes in style.css)
  *     - first (used to specify the first column in a row)
  *     - no-list-margin (will cause contained list elements to collapse as one on mobile sizes)
  */
-function column( $atts, $content = null ) {
+function trestle_column( $atts, $content = null ) {
     extract( shortcode_atts( array(
-        'class' => 'one-half',
+        'class' => '',
     ), $atts ) );
     return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
 }
-add_shortcode( 'col', 'column' );
\ No newline at end of file
+add_shortcode( 'col', 'trestle_column' );
+
+/**
+ * Buttons - [button href="url" class="class"]Text[/button]
+ */
+function trestle_button( $atts, $content = null ) {
+    extract( shortcode_atts( array(
+        'href' => '#',
+        'class' => '',
+    ), $atts ) );
+    return '<a class="button ' . $class . '" href="' . $href . '">' . do_shortcode( $content ) . '</a>';
+}
+add_shortcode( 'button', 'trestle_button' );
\ No newline at end of file
diff --git a/style.css b/style.css
index 0c845de..12eedfd 100644
--- a/style.css
+++ b/style.css
@@ -37,6 +37,7 @@
 	- Plugins
 		- Genesis eNews Extended
 		- Genesis Latest Tweets
+		- Genesis Extender
 		- Gravity Forms
 		- Jetpack
 		- FancyBox for WordPress
@@ -592,6 +593,7 @@ Structure and Layout
 --------------------------------------------- */
 .bubble .entry,
 .bubble .sidebar .widget,
+.bubble .ez-widget-area,
 .bubble .breadcrumb,
 .bubble .archive-description,
 .bubble .author-box,
@@ -869,7 +871,8 @@ Plugins
 	color: #999;
 }
 
-.sidebar .widget.enews-widget {
+.sidebar .widget.enews-widget,
+.bubble .sidebar .widget.enews-widget {
 	background-color: #333;
 }
 
@@ -900,6 +903,7 @@ Plugins
 
 .enews-widget input:hover[type="submit"] {
 	background-color: #fff;
+	border-color: #FFF;
 	color: #333;
 }
 
@@ -911,6 +915,18 @@ Plugins
 	margin-bottom: 1.6rem;
 }
 
+/* Genesis Extender
+--------------------------------------------- */
+
+.home .ez-home-container-area {
+	margin-bottom: 0;
+}
+
+.bubble .ez-widget-area {
+	margin-bottom: 28px;
+}
+
+
 /* Gravity Forms
 --------------------------------------------- */
 
@@ -1077,12 +1093,11 @@ Site Navigation
 /* General Navigation
 --------------------------------------------- */
 
-#menu-button,
-.custom-background.bubble #menu-button {
-	display: block;
+#menu-button {
 	margin: 0 20px;
 	margin: 0 2rem;
 	text-align: center;
+	display: block;
 }
 
 .bubble #menu-button {
@@ -1090,6 +1105,10 @@ Site Navigation
 	margin-top: 2rem;
 }
 
+.custom-background #menu-button {
+	margin-top: 0;
+}
+
 .genesis-nav-menu {
 	clear: both;
 	color: #999;
@@ -1252,10 +1271,10 @@ Site Navigation
 .nav-primary .genesis-nav-menu > .right > .button {
 	padding: 12px 18px;
 	color: #FFF;
+	font-weight: normal;
 }
 
 
-
 /* Sub Menus
 --------------------------------------------- */
 
@@ -1533,7 +1552,8 @@ Sidebars
 	margin-bottom: 0;
 }
 
-.sidebar .widget {
+.sidebar .widget,
+.bubble .ez-widget-area {
 	background-color: #fff;
 	border-radius: 3px;
 }