Skip to content
Browse files

Merge branch 'master' of github.com:pencilcheck/Spicewords

Conflicts:
	www/templates/message.html
  • Loading branch information...
2 parents 6daa9bf + 31c7f27 commit 3a67eda47350e142da94b8a6a299721bd347f89e Penn Su committed Jul 9, 2014
Showing with 8 additions and 1 deletion.
  1. +8 −1 www/templates/message.html
View
9 www/templates/message.html
@@ -9,13 +9,17 @@
<input type="text" placeholder="Type message + select reciepent...">
</label>
</div>
- <paper-button label="flat button">TEST</paper-button>
+ <paper-button label="flat button">TEST</paper-button>
+ <paper-fab icon="favorite"></paper-fab>
<h2>The Crew</h2>
+ <!-- getting rid of this to start using new version
<ion-scroll direction="x" scrollbar-y="false" has-bouncing="false" zooming="false" class="wide-as-needed">
<a class="circle side-margin inset-shadow" ng-repeat="favorite in favorites" ng-click="message(favorite)">
{{favorite}}
</a>
</ion-scroll>
+ -->
+
<ion-scroll direction="x" scrollbar-y="false" has-bouncing="false" zooming="false" class="wide-as-needed" >
<div class="mainPerson avatar" ng-click="message(favorite)">
@@ -35,8 +39,11 @@
</div>
</ion-scroll>
+<<<<<<< HEAD
+=======
+>>>>>>> 31c7f2740d16fbc963d967e9ae6792d6361606d0
<h2>The List</h2>
<ion-scroll direction="x" scrollbar-y="false" has-bouncing="false" zooming="false" class="wide-as-needed">

0 comments on commit 3a67eda

Please sign in to comment.
Something went wrong with that request. Please try again.