Merge branch 'master' of git.linkerplus.com:houyt/xinde11

# Conflicts:
#	testone.txt

testone.txt

@@ -3,7 +3,11 @@ div ng-if="item.t__type == 1">
     <div class="item item-input">
         <span>{{item.name}}</span>
         <label class="input-margin">
-            <input type="text" ng-model="item.text" placeholder="{{note}}"  color:"red">
+
+           
+
+            <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black">
+
         </label>
     </div>
 </div>