Commit 32a67f52fedf4283e1769a01ec711c0a852f58ae

Authored by Nicolás Guarnieri
Exists in master

Merge remote-tracking branch 'upstream/master'

537 KB | W: | H:

545 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -7,10 +7,10 @@
7 7 <!--CSS-->
8 8 <link href="./node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet"/>
9 9 <link href="./node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet"/>
10   - <link rel="stylesheet" href="node_modules/angular-ui-swiper/dist/angular-ui-swiper.css">
11   - <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet">
  10 + <link href="./node_modules/angular-ui-swiper/dist/angular-ui-swiper.css" rel="stylesheet"/>
  11 + <link href="./node_modules/ladda/dist/ladda-themeless.min.css" rel="stylesheet"/>
12 12 <link href="./node_modules/leaflet/dist/leaflet.css" rel="stylesheet"/>
13   - <link href="css/general.css" rel="stylesheet"/>
  13 + <link href="./css/general.css" rel="stylesheet"/>
14 14  
15 15 <!--VENDOR JS-->
16 16 <script src="./node_modules/jquery/dist/jquery.min.js"></script>
... ... @@ -62,9 +62,7 @@
62 62 <script src="./node_modules/foca-seguimiento/dist/foca-seguimiento.min.js"></script>
63 63 <script src="./node_modules/foca-teclado/dist/foca-teclado.min.js"></script>
64 64 <script src="./node_modules/foca-turno-apertura/dist/foca-turno-apertura.min.js"></script>
65   - <!-- <script src="cordova.js"></script> -->
66 65  
67   - <!-- <script src="./dist/wrapper-demo.min.js"></script> -->
68 66 <script src="./src/js/app.js"></script>
69 67 <script src="./src/js/controller.js"></script>
70 68 <script src="./src/etc/develop.js"></script>