Buttons shtuff

This commit is contained in:
Max Lynch
2015-07-20 13:44:27 -05:00
parent 34b62ff172
commit 6c5dbbd680
6 changed files with 40 additions and 8 deletions

View File

@ -18,7 +18,7 @@ $colors: (
),
secondary: (
base: #33d066,
base: #32db64,
inverse: #fff
),
@ -26,7 +26,7 @@ $colors: (
// Action Colors
// ----------------------
danger: (
base: #ec3d3d,
base: #f53d3d,
inverse: #fff,
),
@ -44,7 +44,7 @@ $colors: (
),
dark: (
base: #444,
base: #222,
inverse: #fff,
),

View File

@ -2,10 +2,10 @@
// Core Button Variables
// --------------------------------------------------
$button-font-size: 1.4rem !default;
$button-font-size: 1.6rem !default;
$button-margin: 0.4rem 0 !default;
$button-padding: 0 1.4rem !default;
$button-height: 4.2rem !default;
$button-padding: 0 2rem !default;
$button-height: 4.4rem !default;
$button-border-width: 1px !default;
$button-border-radius: 4px !default;
$button-icon-size: 2.5rem !default;
@ -22,6 +22,9 @@ $button-small-icon-size: 2.1rem !default;
$button-fab-size: 56px;
$button-round-border-radius: 64px !default;
$button-round-padding: 0 2.6rem !default;
// Core Button
// --------------------------------------------------
@ -130,6 +133,11 @@ button,
pointer-events: none;
}
&[round] {
border-radius: $button-round-border-radius;
padding: $button-round-padding;
}
// FABulous buttons (Floating action button from material)
&[fab] {

View File

@ -0,0 +1 @@

View File

@ -0,0 +1,7 @@
import {App} from 'ionic/ionic';
@App({
templateUrl: 'main.html'
})
class IonicApp {}

View File

@ -0,0 +1,18 @@
<div>
<button round light>button light</button>
<button round stable>button stable</button>
<button round primary>button primary</button>
<button round secondary>button secondary</button>
<button round danger>button danger</button>
<button round dark>button dark</button>
</div>
<style>
button {
display: block !important;
margin: 15px auto !important;
}
button:first-child {
margin-top: 80px !important;
}
</style>

View File

@ -22,13 +22,11 @@ form {
// Set font for forms
label,
input,
button,
select,
textarea {
@include font-shorthand($font-size-base, normal, $line-height-base); // Set size, weight, line-height here
}
input,
button,
select,
textarea {
font-family: $font-family-base; // And only set font-family here for those that need it (note the missing label element)