Commit d54f55b3ddaec080b1bf1b813cf38646a110a88f

Authored by Eric Fernandez
Exists in master

Merge branch 'develop' into 'master'

Develop

See merge request !96
src/sass/_botonera-secundaria.scss
1 .botonera-secundaria { 1 .botonera-secundaria {
2 .row { 2 .row {
3 border-radius: 5px; 3 border-radius: 5px;
4 overflow: hidden; 4 overflow: hidden;
5 } 5 }
6 .btn-xs { 6 .btn-xs {
7 display: grid; 7 display: grid;
8 border-width: 3px !important; 8 border-width: 3px !important;
9 border-radius: .7rem !important; 9 border-radius: .7rem !important;
10 margin-right: 1px; 10 margin-right: 1px;
11 width: calc(100% - 1px); 11 width: calc(100% - 1px);
12 margin-bottom: 1px; 12 margin-bottom: 1px;
13 13
14 &:hover{ 14 &:hover{
15 background-color: #d8b07d; 15 background-color: #cd903550 ;
16 border-color: #e09125 !important; 16 border-color: #cd9035 !important;
17 } 17 }
18 &:focus{ 18 &:focus{
19 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125); 19 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
20 } 20 }
21 img{ 21 img{
22 width: 50%; 22 width: 50%;
23 margin: auto 23 margin: auto
24 } 24 }
25 span{ 25 span{
26 font-size: 11px; 26 font-size: 11px;
27 margin-left: -.25rem; 27 margin-left: -.25rem;
28 margin-right: -.25rem; 28 margin-right: -.25rem;
29 } 29 }
30 } 30 }
31 @media(max-width: 992px){ 31 @media(max-width: 992px){
32 .btn-xs{ 32 .btn-xs{
33 font-weight: 700; 33 font-weight: 700;
34 } 34 }
35 } 35 }
36 @media(min-width: 1200px){ 36 @media(min-width: 1200px){
37 .btn-xs{ 37 .btn-xs{
38 height: 85px !important; 38 height: 85px !important;
39 } 39 }
40 .foca-facturador-px{ 40 .foca-facturador-px{
41 padding-left: 3rem; 41 padding-left: 3rem;
42 padding-right: 3rem; 42 padding-right: 3rem;
43 } 43 }
44 } 44 }
45 45
46 @media(min-width: 992px) and (max-width: 1200px){ 46 @media(min-width: 992px) and (max-width: 1200px){
47 .btn-xs{ 47 .btn-xs{
48 height: 73px !important; 48 height: 73px !important;
49 } 49 }
50 } 50 }
51 51
52 @media(min-width: 768px) and (max-width: 992px){ 52 @media(min-width: 768px) and (max-width: 992px){
53 .btn-xs{ 53 .btn-xs{
54 height: 62px !important; 54 height: 62px !important;
55 } 55 }
56 } 56 }
57 57
58 @media(min-width: 576px) and (max-width: 768px){ 58 @media(min-width: 576px) and (max-width: 768px){
59 .btn-xs{ 59 .btn-xs{
60 max-height: 51px; 60 max-height: 51px;
61 } 61 }
62 } 62 }
63 63
64 @media(max-width: 576px) { 64 @media(max-width: 576px) {
65 .btn-xs{ 65 .btn-xs{
66 max-height: 13vw; 66 max-height: 13vw;
67 } 67 }
68 } 68 }
69 69
70 } 70 }
71 71
src/sass/_login.scss
1 .login { 1 .login {
2 background-color: #bdbdbd; 2 background-color: #bdbdbd;
3 border: 1px solid #000000; 3 border: 1px solid #000000;
4 border-radius: 3px; 4 border-radius: 3px;
5 height: calc(193px + 1em); 5 height: calc(193px + 1em);
6 left: calc(50% - 130px); 6 left: calc(50% - 130px);
7 opacity: 0.7; 7 opacity: 0.7;
8 position: absolute; 8 position: absolute;
9 text-align: center; 9 text-align: center;
10 top: 190px; 10 top: 190px;
11 width: 260px; 11 width: 260px;
12 &-titulo { 12 &-titulo {
13 border-bottom: 1px solid #ffffff; 13 border-bottom: 1px solid #ffffff;
14 padding: 5px 0; 14 padding: 5px 0;
15 } 15 }
16 &-campo { 16 &-campo {
17 label { 17 label {
18 display: block; 18 display: block;
19 font-size: 12px; 19 font-size: 12px;
20 margin: 5px 0 0; 20 margin: 5px 0 0;
21 } 21 }
22 input { 22 input {
23 -moz-border-radius: 10px;
24 -khtml-border-radius: 10px;
25 -webkit-border-radius: 10px;
26 -webkit-appearance: none;
27 padding-right: 5%;
28 padding-left: 5%;
29 border-radius: 10px;
30 outline: 0;
31 border-color: transparent;
23 &:focus { 32 &:focus {
24 outline: 3px solid #ff9900; 33 border-color: #ff9900;
25 } 34 }
26 } 35 }
27 } 36 }
37
28 38
29 button { 39 &-button {
30 margin-right: 42px; 40 width: 80%;
41 background-color: #cd9035;
42 color: white;
43 &:hover{
44 background-color: #a7743d;
45 color: white
46 }
47 &:focus{
48 color: white;
49 }
31 } 50 }
32 51
33 &-alerta-error { 52 &-alerta-error {
34 width: 260px; 53 width: 260px;
35 left: calc(50% - 130px); 54 left: calc(50% - 130px);
36 top: calc(383px + 1.5em); 55 top: calc(383px + 1.5em);
37 } 56 }
38 } 57 }
39 58
src/sass/_teclado.scss
1 .keyboard { 1 .keyboard {
2 -webkit-touch-callout: none; 2 -webkit-touch-callout: none;
3 -webkit-user-select: none; 3 -webkit-user-select: none;
4 -khtml-user-select: none; 4 -khtml-user-select: none;
5 -moz-user-select: none; 5 -moz-user-select: none;
6 -ms-user-select: none; 6 -ms-user-select: none;
7 user-select: none; 7 user-select: none;
8 margin: auto; 8 margin: auto;
9 width: 855px; 9 width: 60%;
10 position: inherit; 10 position: absolute;
11 height: auto; 11 height: auto;
12 border: 1px solid rgba(255, 128, 0, .4); 12 border: 1px solid rgba(255, 128, 0, .4);
13 background-color: rgba(0, 0, 0, .3); 13 background-color: rgba(0, 0, 0, .3);
14 bottom: 5px; 14 bottom: 5px;
15 z-index: 100000;
15 table { 16 table {
17 width: auto;
18 height: auto;
19 margin: 0px auto;
16 border-spacing: 10px; 20 border-spacing: 10px;
17 border-collapse: separate; 21 border-collapse: separate;
18 z-index: 100000;
19 td { 22 td {
20 touch-action: none; 23 touch-action: none;
21 } 24 }
22 } 25 }
23 26
24 .letter { 27 .letter {
25 background-color: #bdbdbd; 28 background-color: #bdbdbd;
26 box-shadow: 2px 2px 3px #555555; 29 box-shadow: 2px 2px 3px #555555;
27 width: 47px; 30 padding: 10px;
28 height: 50px; 31 width: auto;
32 height: auto;
29 text-align: center; 33 text-align: center;
30 font-family: "arial"; 34 font-family: "arial";
31 cursor: pointer; 35 cursor: pointer;
32 color: #000; 36 color: #000;
33 font-size: 22px; 37 font-size: 80%;
34 38
35 &:hover { 39 &:hover {
36 background-color: #fafafa; 40 background-color: #fafafa;
37 } 41 }
38 &:active { 42 &:active {
39 background-color: #999; 43 background-color: #999;
40 color: #fff; 44 color: #fff;
41 } 45 }
42 } 46 }
43 .number { 47 .number {
44 background-color: #bdbdbd; 48 background-color: #bdbdbd;
45 box-shadow: 2px 2px 3px #555555; 49 box-shadow: 2px 2px 3px #555555;
46 width: 47px; 50 padding: 10px;
47 height: 35px; 51 width: auto;
52 height: auto;
48 text-align: center; 53 text-align: center;
49 font-family: "arial"; 54 font-family: "arial";
50 cursor: pointer; 55 cursor: pointer;
51 color: #000; 56 color: #000;
52 font-size: 22px; 57 font-size: 80%;
53 58
54 &:hover { 59 &:hover {
55 background-color: #fafafa; 60 background-color: #fafafa;
56 } 61 }
57 &:active { 62 &:active {
58 background-color: #999; 63 background-color: #999;
59 color: #fff; 64 color: #fff;
60 } 65 }
61 } 66 }
62 67
63 .margin { 68 .margin {
64 width: 40px; 69 width: 5%;
65 height: 50px; 70 height: 5%;
66 } 71 }
67 } 72 }
src/sass/general.scss
1 $primary-color: #e09125; 1 $primary-color: #e09125;
2 @import 'admin-seguimiento'; 2 @import 'admin-seguimiento';
3 @import 'bootstrap'; 3 @import 'bootstrap';
4 @import 'botonera'; 4 @import 'botonera';
5 @import 'botonera-lateral'; 5 @import 'botonera-lateral';
6 @import 'botonera-principal'; 6 @import 'botonera-principal';
7 @import 'botonera-secundaria'; 7 @import 'botonera-secundaria';
8 @import 'contenedor'; 8 @import 'contenedor';
9 @import 'lista'; 9 @import 'lista';
10 @import 'login'; 10 @import 'login';
11 @import 'panel-informativo'; 11 @import 'panel-informativo';
12 @import 'tabla'; 12 @import 'tabla';
13 @import 'teclado'; 13 @import 'teclado';
14 @import 'tabla-articulos'; 14 @import 'tabla-articulos';
15 @import 'acciones-mobile'; 15 @import 'acciones-mobile';
16 @import 'swiper'; 16 @import 'swiper';
17 @import 'foca-crear'; 17 @import 'foca-crear';
18 @import 'logistica-pedido-ruta'; 18 @import 'logistica-pedido-ruta';
19 @import 'tabs'; 19 @import 'tabs';
20 @import 'grid'; 20 @import 'grid';
21 @import 'paginador-abm'; 21 @import 'paginador-abm';
22 22
23 23
24 //OCULTA FLECHAS INPUT NUMBER 24 //OCULTA FLECHAS INPUT NUMBER
25 input[type='number'] { 25 input[type='number'] {
26 -moz-appearance:textfield; 26 -moz-appearance:textfield;
27 } 27 }
28 input::-webkit-outer-spin-button, 28 input::-webkit-outer-spin-button,
29 input::-webkit-inner-spin-button { 29 input::-webkit-inner-spin-button {
30 -webkit-appearance: none; 30 -webkit-appearance: none;
31 } 31 }
32 32
33 .d-md-grid{ 33 .d-md-grid{
34 @media (min-width: 768px) { 34 @media (min-width: 768px) {
35 display: grid !important; 35 display: grid !important;
36 } 36 }
37 } 37 }
38 38
39 .btn-outline-debo{ 39 .btn-outline-debo{
40 background-color: transparent; 40 background-color: transparent;
41 color: $primary-color; 41 color: $primary-color;
42 border-color: $primary-color; 42 border-color: $primary-color;
43 &:hover{ 43 &:hover{
44 color: #FFF; 44 color: #FFF;
45 border-color: transparent; 45 border-color: transparent;
46 background-color: $primary-color; 46 background-color: $primary-color;
47 } 47 }
48 } 48 }
49 49
50 .front-index{ 50 .front-index{
51 z-index: 9999; 51 z-index: 9999;
52 } 52 }
53 53
54 .uib-daypicker{ 54 .uib-daypicker{
55 outline: 0 55 outline: 0
56 } 56 }
57 57
58 .right-0{ 58 .right-0{
59 right: 0; 59 right: 0;
60 } 60 }
61 61
62 .tabla-factura{ 62 .tabla-factura{
63 word-wrap: break-word; 63 word-wrap: break-word;
64 table-layout: fixed; 64 table-layout: fixed;
65 } 65 }
66 66
67 .ladda-w-100 .ladda-label{ 67 .ladda-w-100 .ladda-label{
68 width: 100% 68 width: 100%;
69 float: right;
69 } 70 }
70 71
71 .btn-delete-image{ 72 .btn-delete-image{
72 height: 25px; 73 height: 25px;
73 width: 25px; 74 width: 25px;
74 top: -10px; 75 top: -10px;
75 right: 0; 76 right: 0;
76 } 77 }
77 78
78 button.clear-input{ 79 button.clear-input{
79 cursor: pointer; 80 cursor: pointer;
80 background: transparent; 81 background: transparent;
81 border: none; 82 border: none;
82 margin-left: -24px; 83 margin-left: -24px;
83 z-index: 9; 84 z-index: 9;
85 color: #a3a3a3;
84 &:focus{ 86 &:focus{
85 outline: none; 87 outline: none;
86 } 88 }
87 } 89 }
88 90