Merge remote-tracking branch 'origin/master'

This commit is contained in:
Nick Wientge 2015-02-24 16:08:32 -08:00
commit 2d3b2e781f

View file

@ -1,9 +1,11 @@
<template name="ionTab">
<a class="{{classes}} {{isActive}}" href="{{url}}" data-ion-tab>
{{#if isActive}}
{{> ionIcon icon=activeIcon}}
{{else}}
{{> ionIcon icon=defaultIcon}}
{{#if defaultIcon}}
{{#if isActive}}
{{> ionIcon icon=activeIcon}}
{{else}}
{{> ionIcon icon=defaultIcon}}
{{/if}}
{{/if}}
{{title}}