feat(buttons): more v2 like buttons

mlynch · mlynch · commit 21e54be63c3b · 2015-12-09T12:38:08.000-06:00
diff --git a/scss/_mixins.scss b/scss/_mixins.scss
@@ -3,7 +3,7 @@
 // --------------------------------------------------
 
 @mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) {
-  border-color: $border-color;
+  border-color: transparent;//$border-color;
   background-color: $bg-color;
   color: $color;
 
@@ -14,9 +14,9 @@
   }
   &.active,
   &.activated {
-    border-color: $active-border-color;
+    //border-color: transparent;//$active-border-color;
     background-color: $active-bg-color;
-    box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);
+    //box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);
   }
 }
 
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -69,7 +69,7 @@ $scroll-refresh-icon-color:       #666666 !default;
 $button-color:                    #222 !default;
 $button-block-margin:             10px !default;
 $button-clear-padding:            6px !default;
-$button-border-radius:            2px !default;
+$button-border-radius:            4px !default;
 $button-border-width:             1px !default;
 
 $button-font-size:                16px !default;
diff --git a/test/css/buttons.html b/test/css/buttons.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html ng-app="ionic">
+  <head>
+    <script src="../../dist/js/ionic.bundle.js"></script>
+    <meta charset="utf-8">
+    <title>Buttons</title>
+    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
+    <link href="../../dist/css/ionic.css" rel="stylesheet">
+    <style>
+      body {
+        position: absolute;;
+      }
+    </style>
+  </head>
+  <body>
+
+    <header class="bar bar-header bar-dark">
+      <h1 class="title">Buttons: borderless</h1>
+    </header>
+
+    <div class="content has-header">
+
+      <button class="button button-primary">Hello</button>
+      <button class="button button-assertive">Hello</button>
+      <button class="button button-stable">Hello</button>
+      <button class="button button-calm">Hello</button>
+    </div>
+
+  </body>
+</html>

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`// --------------------------------------------------`
`4`	`4`
`5`	`5`	`@mixin button-style($bg-color, $border-color, $active-bg-color, $active-border-color, $color) {`
`6`		`- border-color: $border-color;`
	`6`	`+ border-color: transparent;//$border-color;`
`7`	`7`	`background-color: $bg-color;`
`8`	`8`	`color: $color;`
`9`	`9`
`@@ -14,9 +14,9 @@`
`14`	`14`	`}`
`15`	`15`	`&.active,`
`16`	`16`	`&.activated {`
`17`		`- border-color: $active-border-color;`
	`17`	`+ //border-color: transparent;//$active-border-color;`
`18`	`18`	`background-color: $active-bg-color;`
`19`		`- box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);`
	`19`	`+ //box-shadow: inset 0 1px 4px rgba(0,0,0,0.1);`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`