HOUYT il y a 7 ans
Parent
commit
fc8a0319fe
2 fichiers modifiés avec 0 ajouts et 68 suppressions
  1. 0 58
      shishikan.txt
  2. 0 10
      testone.txt

+ 0 - 58
shishikan.txt

@@ -1,58 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no, width=device-width">
-    <!--     <meta http-equiv="Content-Security-Policy" content="default-src *; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'"> -->
-    <title></title>
-    <!-- compiled css output -->
-    <link href="/css/ionic.app.min.css" rel="stylesheet">
-    <link href="/css/linker.min.css" rel="stylesheet">
-     <link href="/css/linker.max.css" rel="stylesheet" color:"blue">
-       <link href="/css/linker.first.js"  background-color:"green"  font-sixe:12px>	
-<<<<<<< .mine
-
-=======
-  
->>>>>>> .theirs
- 
-
-
-    <script src="/lib/ionic/js/ionic.bundle.min.js"></script>
-    <!-- cordova script (this will be a 404 during development) -->
-    <script src="/lib/ngCordova/dist/ng-cordova.min.js"></script>
-    <!-- cordova script (this will be a 404 during development) -->
-    <script src="/cordova.js"></script>
-    <!-- your app's js -->
-    <script src="/lib/underscore/underscore-min.js"></script>
-    <script src="/lib/angular-resource/angular-resource.min.js"></script>
-    <script src="/lib/angular-underscore-module/angular-underscore-module.js"></script>
-    <script src="/lib/angular-translate/angular-translate.min.js"></script>
-    
-    <script src="/lib/angular-translate-loader-static-files/angular-translate-loader-static-files.min.js"></script>
-    <script src="/js/starter.min.js"></script>
-    <script src="js/route.js"></script>
-    <script src="js/controllers.js"></script>
-    <script src="js/directive.js"></script>
-    <script src="js/factory.js"></script>
-</head>
-
-<body ng-app="starter" ng-cloak>
-<!--
-  The nav bar that will be updated as we navigate between views.
--->
-<ion-nav-bar class="bar-stable" ng-cloak>
-    <ion-nav-back-button class="button ion-chevron-left button-clear button-dark">
-        ·µ»Ø
-    </ion-nav-back-button>
-</ion-nav-bar>
-<!--
-  The views will be rendered in the <ion-nav-view> directive below
-  Templates are in the /templates folder (but you could also
-  have templates inline in this html file if you'd like).
--->
-<ion-nav-view></ion-nav-view>
-</body>
-
-</html>

+ 0 - 10
testone.txt

@@ -1,10 +0,0 @@
-div ng-if="item.t__type == 1">
-    <div class="item item-divider"></div>
-    <div class="item item-input">
-        <span>{{item.name}}</span>
-        <label class="input-margin">
-      <input type="text" ng-model="item.text" placeholder="{{note}}" style="background-colro:black;colro:red">
-        <p>this is a new world</p>
-          </label>
-    </div>
-</div>