errors solved
|
@ -12,9 +12,8 @@
|
|||
<exclude-output />
|
||||
<content url="file://$MODULE_DIR$">
|
||||
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
|
||||
<excludeFolder url="file://$MODULE_DIR$/build" />
|
||||
</content>
|
||||
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
|
@ -32,6 +32,8 @@ html{
|
|||
}
|
||||
|
||||
body {
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
-webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */
|
||||
-webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */
|
||||
-webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */
|
||||
|
@ -41,7 +43,7 @@ body {
|
|||
font-size:12px;
|
||||
|
||||
margin:0px;
|
||||
padding:0px;
|
||||
|
||||
|
||||
color: #fff;
|
||||
|
||||
|
@ -56,6 +58,10 @@ p{
|
|||
.contentPhoto{
|
||||
width: 100%;
|
||||
padding: 25px 0px;
|
||||
margin-top: 24px;
|
||||
}
|
||||
.blackground{
|
||||
background: #242424;
|
||||
}
|
||||
#photo{
|
||||
max-width: 100%;
|
||||
|
@ -84,7 +90,7 @@ p{
|
|||
background: #000;
|
||||
height: 50px;
|
||||
padding: 5px 0;
|
||||
|
||||
left: 0;
|
||||
}
|
||||
.btnmin{
|
||||
float: left;
|
||||
|
@ -113,6 +119,7 @@ p{
|
|||
display: block;
|
||||
width: 80px;
|
||||
margin-top: 50px;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
h1{
|
||||
color: #fff;
|
||||
|
@ -150,18 +157,11 @@ spam{
|
|||
z-index: 999;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(247,120,36,1);
|
||||
background: -moz-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(247,120,36,1)), color-stop(23%, rgba(247,120,36,1)), color-stop(100%, rgba(250,217,97,1)));
|
||||
background: -webkit-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -o-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -ms-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f77824', endColorstr='#fad961', GradientType=1 );
|
||||
background: #fff;
|
||||
}
|
||||
.btnbarcode{
|
||||
margin-bottom: 10px;
|
||||
background-color: rgba(0,0,0,.150);
|
||||
background-color: #D4D2D4;
|
||||
background-image: url(../img/barcode.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 25px;
|
||||
|
@ -169,14 +169,14 @@ spam{
|
|||
background-position-x: 10px;
|
||||
width: 100%;
|
||||
height: 50px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
padding-left: 43px;
|
||||
font-size: 1.2em;
|
||||
padding-top: 14px;
|
||||
}
|
||||
.btnsalix{
|
||||
margin-bottom: 10px;
|
||||
background-color: rgba(0,0,0,.150);
|
||||
background-color: #8DD202;
|
||||
background-image: url(../img/salix.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 25px;
|
||||
|
@ -184,7 +184,7 @@ spam{
|
|||
background-position-x: 10px;
|
||||
width: 100%;
|
||||
height: 50px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
padding-left: 43px;
|
||||
font-size: 1.2em;
|
||||
padding-top: 14px;
|
||||
|
@ -207,11 +207,11 @@ label{
|
|||
background-position: center;
|
||||
}
|
||||
.input{
|
||||
background: rgba(0,0,0,.150);
|
||||
padding: 10px;
|
||||
background: #D4D2D4;
|
||||
padding: 14px;
|
||||
overflow: hidden;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
}
|
||||
.input img{
|
||||
width: 25px;
|
||||
|
@ -254,16 +254,21 @@ input.middle:focus {
|
|||
.btn{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
background: #F1D05E;
|
||||
background: #8DD202;
|
||||
color: #fff;
|
||||
|
||||
font-size: 1.2em;
|
||||
padding: 10px;
|
||||
}
|
||||
.loginbtn{
|
||||
border-radius: 31px;
|
||||
position: fixed;
|
||||
bottom: 15px;
|
||||
left: 0;
|
||||
width: 200px;
|
||||
margin: auto;
|
||||
right: 0;
|
||||
padding: 18px;
|
||||
}
|
||||
.mainheader{
|
||||
width: 100%;
|
||||
|
@ -328,6 +333,11 @@ input.middle:focus {
|
|||
header{
|
||||
background: #000;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
header h1{
|
||||
float: left;
|
||||
|
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.0 KiB |
|
@ -9,15 +9,15 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
|
||||
<link rel="stylesheet" type="text/css" href="css/index.css">
|
||||
<title>Verdnatura Laboral</title>
|
||||
<title>Verdnatura Photo</title>
|
||||
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="js/fastclick.js" type="application/javascript"></script>
|
||||
|
||||
</head>
|
||||
<body class="greenBackground">
|
||||
<body>
|
||||
|
||||
<img id="logo" src="img/logo.png" alt="verdnatura"/>
|
||||
<h1>Verdnatura</h1>
|
||||
|
||||
<div class="input">
|
||||
<img src="img/user.png" alt="verdnatura" />
|
||||
<input type="text" id="txtuser" placeholder="usuario" value=""/>
|
||||
|
|
|
@ -122,11 +122,11 @@ function confirmSave(buttonIndex) {
|
|||
|
||||
data.append("token", localStorage.getItem("token"));
|
||||
|
||||
data.append("user", localStorage.getItem("user"));
|
||||
/*data.append("user", localStorage.getItem("user"));
|
||||
|
||||
data.append("password", localStorage.getItem("password"));
|
||||
|
||||
data.append("updateMatching", 1);
|
||||
data.append("updateMatching", 1);*/
|
||||
|
||||
data.append("image", img);
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
|
||||
<link rel="stylesheet" type="text/css" href="css/index.css">
|
||||
<link href="css/cropper.css" rel="stylesheet" type="text/css"/>
|
||||
<title>Verdnatura Laboral</title>
|
||||
<title>Verdnatura Photo</title>
|
||||
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="js/fastclick.js" type="application/javascript"></script>
|
||||
</head>
|
||||
<body class="blueBackground">
|
||||
<body class="blackground">
|
||||
<header>
|
||||
<div class="btnback"></div>
|
||||
<div class="btnsave"></div>
|
||||
|
@ -41,7 +41,7 @@
|
|||
</div>
|
||||
|
||||
<div class="btnbarcode">Scan</div>
|
||||
<div class="btnsalix">Salix</div>
|
||||
|
||||
|
||||
<div class="btn loginbtn" id="btntakepicture">
|
||||
¡Go!
|
||||
|
|
|
@ -32,6 +32,8 @@ html{
|
|||
}
|
||||
|
||||
body {
|
||||
background: #fff;
|
||||
padding: 20px;
|
||||
-webkit-touch-callout: none; /* prevent callout to copy image, etc when tap to hold */
|
||||
-webkit-text-size-adjust: none; /* prevent webkit from resizing text to fit */
|
||||
-webkit-user-select: none; /* prevent copy paste, to allow, change 'none' to 'text' */
|
||||
|
@ -41,7 +43,7 @@ body {
|
|||
font-size:12px;
|
||||
|
||||
margin:0px;
|
||||
padding:0px;
|
||||
|
||||
|
||||
color: #fff;
|
||||
|
||||
|
@ -56,6 +58,10 @@ p{
|
|||
.contentPhoto{
|
||||
width: 100%;
|
||||
padding: 25px 0px;
|
||||
margin-top: 24px;
|
||||
}
|
||||
.blackground{
|
||||
background: #242424;
|
||||
}
|
||||
#photo{
|
||||
max-width: 100%;
|
||||
|
@ -84,7 +90,7 @@ p{
|
|||
background: #000;
|
||||
height: 50px;
|
||||
padding: 5px 0;
|
||||
|
||||
left: 0;
|
||||
}
|
||||
.btnmin{
|
||||
float: left;
|
||||
|
@ -113,6 +119,7 @@ p{
|
|||
display: block;
|
||||
width: 80px;
|
||||
margin-top: 50px;
|
||||
margin-bottom: 50px;
|
||||
}
|
||||
h1{
|
||||
color: #fff;
|
||||
|
@ -150,18 +157,11 @@ spam{
|
|||
z-index: 999;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: rgba(247,120,36,1);
|
||||
background: -moz-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(247,120,36,1)), color-stop(23%, rgba(247,120,36,1)), color-stop(100%, rgba(250,217,97,1)));
|
||||
background: -webkit-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -o-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: -ms-linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
background: linear-gradient(45deg, rgba(247,120,36,1) 0%, rgba(247,120,36,1) 23%, rgba(250,217,97,1) 100%);
|
||||
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f77824', endColorstr='#fad961', GradientType=1 );
|
||||
background: #fff;
|
||||
}
|
||||
.btnbarcode{
|
||||
margin-bottom: 10px;
|
||||
background-color: rgba(0,0,0,.150);
|
||||
background-color: #D4D2D4;
|
||||
background-image: url(../img/barcode.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 25px;
|
||||
|
@ -169,14 +169,14 @@ spam{
|
|||
background-position-x: 10px;
|
||||
width: 100%;
|
||||
height: 50px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
padding-left: 43px;
|
||||
font-size: 1.2em;
|
||||
padding-top: 14px;
|
||||
}
|
||||
.btnsalix{
|
||||
margin-bottom: 10px;
|
||||
background-color: rgba(0,0,0,.150);
|
||||
background-color: #8DD202;
|
||||
background-image: url(../img/salix.png);
|
||||
background-repeat: no-repeat;
|
||||
background-size: 25px;
|
||||
|
@ -184,7 +184,7 @@ spam{
|
|||
background-position-x: 10px;
|
||||
width: 100%;
|
||||
height: 50px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
padding-left: 43px;
|
||||
font-size: 1.2em;
|
||||
padding-top: 14px;
|
||||
|
@ -207,11 +207,11 @@ label{
|
|||
background-position: center;
|
||||
}
|
||||
.input{
|
||||
background: rgba(0,0,0,.150);
|
||||
padding: 10px;
|
||||
background: #D4D2D4;
|
||||
padding: 14px;
|
||||
overflow: hidden;
|
||||
margin-bottom: 10px;
|
||||
border-radius: 15px;
|
||||
border-radius: 26px;
|
||||
}
|
||||
.input img{
|
||||
width: 25px;
|
||||
|
@ -254,16 +254,21 @@ input.middle:focus {
|
|||
.btn{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
background: #F1D05E;
|
||||
background: #8DD202;
|
||||
color: #fff;
|
||||
|
||||
font-size: 1.2em;
|
||||
padding: 10px;
|
||||
}
|
||||
.loginbtn{
|
||||
border-radius: 31px;
|
||||
position: fixed;
|
||||
bottom: 15px;
|
||||
left: 0;
|
||||
width: 200px;
|
||||
margin: auto;
|
||||
right: 0;
|
||||
padding: 18px;
|
||||
}
|
||||
.mainheader{
|
||||
width: 100%;
|
||||
|
@ -328,6 +333,11 @@ input.middle:focus {
|
|||
header{
|
||||
background: #000;
|
||||
overflow: hidden;
|
||||
position: fixed;
|
||||
top: 0;
|
||||
width: 100%;
|
||||
left: 0;
|
||||
}
|
||||
}
|
||||
header h1{
|
||||
float: left;
|
||||
|
|
Before Width: | Height: | Size: 4.3 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 2.3 KiB After Width: | Height: | Size: 2.0 KiB |
|
@ -9,15 +9,15 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
|
||||
<link rel="stylesheet" type="text/css" href="css/index.css">
|
||||
<title>Verdnatura Laboral</title>
|
||||
<title>Verdnatura Photo</title>
|
||||
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="js/fastclick.js" type="application/javascript"></script>
|
||||
|
||||
</head>
|
||||
<body class="greenBackground">
|
||||
<body>
|
||||
|
||||
<img id="logo" src="img/logo.png" alt="verdnatura"/>
|
||||
<h1>Verdnatura</h1>
|
||||
|
||||
<div class="input">
|
||||
<img src="img/user.png" alt="verdnatura" />
|
||||
<input type="text" id="txtuser" placeholder="usuario" value=""/>
|
||||
|
|
|
@ -122,11 +122,11 @@ function confirmSave(buttonIndex) {
|
|||
|
||||
data.append("token", localStorage.getItem("token"));
|
||||
|
||||
data.append("user", localStorage.getItem("user"));
|
||||
/*data.append("user", localStorage.getItem("user"));
|
||||
|
||||
data.append("password", localStorage.getItem("password"));
|
||||
|
||||
data.append("updateMatching", 1);
|
||||
data.append("updateMatching", 1);*/
|
||||
|
||||
data.append("image", img);
|
||||
|
||||
|
|
|
@ -8,11 +8,11 @@
|
|||
<meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
|
||||
<link rel="stylesheet" type="text/css" href="css/index.css">
|
||||
<link href="css/cropper.css" rel="stylesheet" type="text/css"/>
|
||||
<title>Verdnatura Laboral</title>
|
||||
<title>Verdnatura Photo</title>
|
||||
<script src="js/jquery-3.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="js/fastclick.js" type="application/javascript"></script>
|
||||
</head>
|
||||
<body class="blueBackground">
|
||||
<body class="blackground">
|
||||
<header>
|
||||
<div class="btnback"></div>
|
||||
<div class="btnsave"></div>
|
||||
|
|