Merge remote-tracking branch 'origin/open614d' into open-master

This commit is contained in:
bwyu
2015-01-05 11:14:07 -08:00
43 changed files with 1058 additions and 52 deletions

View File

@@ -1,5 +1,13 @@
<!-- look at action-button for example -->
<span class="t-filter l-filter">
<input type="search" class="t-filter-input" ng-model="filter" placeholder="Filter..."/>
<a class="ui-symbol t-a-clear s-a-clear" ng-click="filter = null">x</a>
<span class="t-filter l-filter"
ng-controller="GetterSetterController">
<input type="search"
class="t-filter-input"
ng-model="getterSetter.value"
placeholder="Filter..."/>
<a class="ui-symbol t-a-clear s-a-clear"
ng-show="getterSetter.value !== ''"
ng-click="getterSetter.value = ''">
x
</a>
</span>