diff --git a/ionic/components/app/test/snapcat/index.js b/ionic/components/app/test/snapcat/index.js index 89ecf685db..ba7f40a4b4 100644 --- a/ionic/components/app/test/snapcat/index.js +++ b/ionic/components/app/test/snapcat/index.js @@ -137,7 +137,7 @@ export class IonicApp { selector: 'settings-modal' }) @View({ - template: '', + template: '', directives: [Nav, Button, Content] }) export class SettingsModal { @@ -154,7 +154,7 @@ export class SettingsModal { selector: 'heart-modal' }) @View({ - template: '', + template: '

20

You\'re pretty awesome

', directives: [Nav, Button, Content] }) export class HeartModal { diff --git a/ionic/components/app/test/snapcat/main.html b/ionic/components/app/test/snapcat/main.html index 0250f9c88d..3e3f9808ea 100644 --- a/ionic/components/app/test/snapcat/main.html +++ b/ionic/components/app/test/snapcat/main.html @@ -36,6 +36,9 @@ diff --git a/ionic/components/app/typography.scss b/ionic/components/app/typography.scss index 21c4090f9a..75ecb1e563 100644 --- a/ionic/components/app/typography.scss +++ b/ionic/components/app/typography.scss @@ -34,7 +34,7 @@ ion-app { h1, h2, h3, h4, h5, h6 { font-weight: $headings-font-weight; - font-family: $headings-font-family; + //font-family: $headings-font-family; line-height: $headings-line-height; margin-top: 1.6rem; margin-bottom: 1rem; diff --git a/ionic/components/button/button.scss b/ionic/components/button/button.scss index 7859b7112a..a4e30477aa 100644 --- a/ionic/components/button/button.scss +++ b/ionic/components/button/button.scss @@ -8,7 +8,7 @@ $button-padding: 0 1.4rem !default; $button-height: 4.2rem !default; $button-border-width: 1px !default; $button-border-radius: 4px !default; -$button-icon-size: 3rem !default; +$button-icon-size: 2.5rem !default; $button-large-font-size: 2rem !default; $button-large-height: 5.4rem !default; @@ -81,6 +81,8 @@ $button-small-icon-size: 2.1rem !default; &.button-icon { font-size: $button-icon-size; + background: none; + border: none; } &.button-large {