From a3b45c3c0208b539803ebdbbcf89e45d3f9c316d Mon Sep 17 00:00:00 2001
From: Ben Sperry <ben@drifty.com>
Date: Mon, 26 Aug 2013 11:01:34 -0500
Subject: [PATCH] Added border color darken for active state on buttons, made
 buttons by default block

---
 .gitignore                            |  5 ++++-
 dist/framework-with-theme.css         | 29 ++++++++++++++++++---------
 scss/framework/structure/_button.scss |  8 ++++++--
 scss/framework/structure/_mixins.scss |  1 +
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f1c485c27..335b4f2d8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
 .DS_Store
 *.sw[mpcod]
 
-.sass-cache/
\ No newline at end of file
+.sass-cache/
+framework.sublime-project
+
+framework.sublime-workspace
diff --git a/dist/framework-with-theme.css b/dist/framework-with-theme.css
index 7ccda54253..a5f85d3765 100644
--- a/dist/framework-with-theme.css
+++ b/dist/framework-with-theme.css
@@ -1,3 +1,4 @@
+@charset "UTF-8";
 html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%; }
@@ -44,11 +45,13 @@ main > * {
 
 .button {
   position: relative;
-  display: inline-block;
+  display: block;
   vertical-align: middle;
   text-align: center;
   cursor: pointer;
   margin: 0; }
+  .button.button-inline {
+    display: inline-block; }
   .button.button-borderless {
     border: none; }
 
@@ -331,7 +334,8 @@ a.list-item {
     text-decoration: none; }
   .button-default.active, .button-default:active {
     background-color: #e6e6e6;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #c4c4c4; }
 
 .button-secondary {
   color: #333333;
@@ -342,7 +346,8 @@ a.list-item {
     text-decoration: none; }
   .button-secondary.active, .button-secondary:active {
     background-color: gainsboro;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #b3b3b3; }
 
 .button-primary {
   color: white;
@@ -353,7 +358,8 @@ a.list-item {
     text-decoration: none; }
   .button-primary.active, .button-primary:active {
     background-color: #3d7be2;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #3d67ae; }
 
 .button-info {
   color: white;
@@ -364,7 +370,8 @@ a.list-item {
     text-decoration: none; }
   .button-info.active, .button-info:active {
     background-color: #34c6df;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #3998a9; }
 
 .button-success {
   color: white;
@@ -375,7 +382,8 @@ a.list-item {
     text-decoration: none; }
   .button-success.active, .button-success:active {
     background-color: #6fac45;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #597e41; }
 
 .button-warning {
   color: white;
@@ -386,7 +394,8 @@ a.list-item {
     text-decoration: none; }
   .button-warning.active, .button-warning:active {
     background-color: #eba612;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #a47a21; }
 
 .button-danger {
   color: white;
@@ -397,7 +406,8 @@ a.list-item {
     text-decoration: none; }
   .button-danger.active, .button-danger:active {
     background-color: #cc3724;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: #94362a; }
 
 .button-dark {
   color: white;
@@ -408,7 +418,8 @@ a.list-item {
     text-decoration: none; }
   .button-dark.active, .button-dark:active {
     background-color: #2b2b2b;
-    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15); }
+    box-shadow: inset 0px 1px 3px rgba(0, 0, 0, 0.15);
+    border-color: black; }
 
 .list-divider {
   background-color: whitesmoke;
diff --git a/scss/framework/structure/_button.scss b/scss/framework/structure/_button.scss
index 7823cd68b2..9f51021d07 100644
--- a/scss/framework/structure/_button.scss
+++ b/scss/framework/structure/_button.scss
@@ -1,12 +1,16 @@
 .button {
 	position: relative;
-	display: inline-block;
+	display: block;
 	vertical-align: middle;
 	text-align: center;
 	cursor: pointer;
 	margin: 0;
 
-  &.button-borderless {
+	&.button-inline {
+		display: inline-block;
+	}
+
+	&.button-borderless {
     border: none;
   }
 }
diff --git a/scss/framework/structure/_mixins.scss b/scss/framework/structure/_mixins.scss
index eee25c641c..da7b69e92d 100644
--- a/scss/framework/structure/_mixins.scss
+++ b/scss/framework/structure/_mixins.scss
@@ -16,6 +16,7 @@
 	&.active, &:active {
 		background-color: darken($bgColor, 10%);
     box-shadow: inset 0px 1px 3px rgba(0,0,0,0.15);
+    border-color: darken($borderColor, 10%);
 	}
 }