Commit c37859cdf9130ebf3c444a8ee672e5b8c66b10db

Authored by Eric Fernandez
Exists in master and in 1 other branch develop

Merge branch 'master' into 'develop'

Master

See merge request !97
src/sass/_botonera-secundaria.scss
1 .botonera-secundaria { 1 .botonera-secundaria {
2 height: 78px;
2 .row { 3 .row {
3 border-radius: 5px; 4 border-radius: 5px;
4 overflow: hidden; 5 overflow: hidden;
5 } 6 }
6 .btn-xs { 7 .btn-xs {
7 display: grid; 8 display: grid;
8 border-width: 3px !important; 9 border-width: 3px !important;
9 border-radius: .7rem !important; 10 border-radius: .7rem !important;
10 margin-right: 1px; 11 margin-right: 1px;
11 width: calc(100% - 1px); 12 width: calc(100% - 1px);
12 margin-bottom: 1px; 13 margin-bottom: 1px;
13 14
14 &:hover{ 15 &:hover{
15 background-color: #cd903550 ; 16 background-color: #cd903550 ;
16 border-color: #cd9035 !important; 17 border-color: #cd9035 !important;
17 } 18 }
18 &:focus{ 19 &:focus{
19 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125); 20 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
20 } 21 }
21 img{ 22 img{
22 width: 50%; 23 width: 50%;
23 margin: auto 24 margin: auto
24 } 25 }
25 span{ 26 span{
26 font-size: 11px; 27 font-size: 11px;
27 margin-left: -.25rem; 28 margin-left: -.25rem;
28 margin-right: -.25rem; 29 margin-right: -.25rem;
29 } 30 }
30 } 31 }
31 @media(max-width: 992px){ 32 @media(max-width: 992px){
32 .btn-xs{ 33 .btn-xs{
33 font-weight: 700; 34 font-weight: 700;
34 } 35 }
35 } 36 }
36 @media(min-width: 1200px){ 37 @media(min-width: 1200px){
37 .btn-xs{ 38 .btn-xs{
38 height: 85px !important; 39 height: 85px !important;
39 } 40 }
40 .foca-facturador-px{ 41 .foca-facturador-px{
41 padding-left: 3rem; 42 padding-left: 3rem;
42 padding-right: 3rem; 43 padding-right: 3rem;
43 } 44 }
44 } 45 }
45 46
46 @media(min-width: 992px) and (max-width: 1200px){ 47 @media(min-width: 992px) and (max-width: 1200px){
47 .btn-xs{ 48 .btn-xs{
48 height: 73px !important; 49 height: 73px !important;
49 } 50 }
50 } 51 }
51 52
52 @media(min-width: 768px) and (max-width: 992px){ 53 @media(min-width: 768px) and (max-width: 992px){
53 .btn-xs{ 54 .btn-xs{
54 height: 62px !important; 55 height: 62px !important;
55 } 56 }
56 } 57 }
57 58
58 @media(min-width: 576px) and (max-width: 768px){ 59 @media(min-width: 576px) and (max-width: 768px){
59 .btn-xs{ 60 .btn-xs{
60 max-height: 51px; 61 max-height: 51px;
61 } 62 }
62 } 63 }
63 64
64 @media(max-width: 576px) { 65 @media(max-width: 576px) {
65 .btn-xs{ 66 .btn-xs{
66 max-height: 13vw; 67 max-height: 13vw;
67 } 68 }
68 } 69 }
69 70
70 } 71 }
71 72
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; 23 -moz-border-radius: 10px;
24 -khtml-border-radius: 10px; 24 -khtml-border-radius: 10px;
25 -webkit-border-radius: 10px; 25 -webkit-border-radius: 10px;
26 -webkit-appearance: none; 26 -webkit-appearance: none;
27 padding-right: 5%; 27 padding-right: 5%;
28 padding-left: 5%; 28 padding-left: 5%;
29 border-radius: 10px; 29 border-radius: 10px;
30 outline: 0; 30 outline: 0;
31 border-color: transparent; 31 border-color: transparent;
32 &:focus { 32 &:focus {
33 border-color: #ff9900; 33 border-color: #ff9900;
34 } 34 }
35 } 35 }
36 } 36 }
37 37
38
39 &-button { 38 &-button {
40 width: 80%; 39 width: 80%;
41 background-color: #cd9035; 40 background-color: #cd9035;
42 color: white; 41 color: white;
43 &:hover{ 42 &:hover{
44 background-color: #a7743d; 43 background-color: #a7743d;
45 color: white 44 color: white
46 } 45 }
47 &:focus{ 46 &:focus{
48 color: white; 47 color: white;
49 } 48 }
50 } 49 }
51 50
52 &-alerta-error { 51 &-alerta-error {
53 width: 260px; 52 width: 260px;
54 left: calc(50% - 130px); 53 left: calc(50% - 130px);
55 top: calc(383px + 1.5em); 54 top: calc(383px + 1.5em);
56 } 55 }
57 } 56 }
58 57
src/sass/_swiper.scss
1 .swiper { 1 .swiper {
2 &-container { 2 &-container {
3 height: 300px; 3 height: 300px;
4
5 } 4 }
6 &-slide { 5 &-slide {
7 background: transparent; 6 background: transparent;
8 height: 400px; 7 height: 400px;
9 text-align: unset; 8 text-align: unset;
10 -webkit-align-items: unset; 9 -webkit-align-items: unset;
11 align-items: unset; 10 align-items: unset;
12 } 11 }
13 12
14 @media(max-width: 992px){ 13 @media(max-width: 992px){
15 &-container{ 14 &-container{
16 height: 430px; 15 height: 430px;
17 } 16 }
18 &-pagination{ 17 &-pagination{
19 background: #CCC; 18 background: #CCC;
20 padding: 0.5rem; 19 padding: 0.5rem;
21 } 20 }
22 } 21 }
23 } 22 }
23
24 .swiper-pagination-bullet-active {
25 opacity: 1;
26 background: #CD9035;
27 }
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
28 input::-webkit-outer-spin-button, 29 input::-webkit-outer-spin-button,
29 input::-webkit-inner-spin-button { 30 input::-webkit-inner-spin-button {
30 -webkit-appearance: none; 31 -webkit-appearance: none;
31 } 32 }
32 33
33 .d-md-grid{ 34 .d-md-grid{
34 @media (min-width: 768px) { 35 @media (min-width: 768px) {
35 display: grid !important; 36 display: grid !important;
36 } 37 }
37 } 38 }
38 39
39 .btn-outline-debo{ 40 .btn-outline-debo{
40 background-color: transparent; 41 background-color: transparent;
41 color: $primary-color; 42 color: $primary-color;
42 border-color: $primary-color; 43 border-color: $primary-color;
43 &:hover{ 44 &:hover{
44 color: #FFF; 45 color: #FFF;
45 border-color: transparent; 46 border-color: transparent;
46 background-color: $primary-color; 47 background-color: $primary-color;
47 } 48 }
48 } 49 }
49 50
51 .btn-brown {
52 background-color:#Cd9035;
53 -webkit-appearance: none;
54 border-color: transparent;
55 &:focus {
56 outline: 0 !important;
57 box-shadow: none;
58 }
59 .icon-white {
60 color: white;
61 }
62 }
63
64
65 .page-item.active .page-link {
66 z-index: 1;
67 color: #fff;
68 background-color: #Cd9035;
69 border-color: #Cd9035;
70 }
71
72 .foca-input {
73 &:focus {
74 border-color: #Cd9035;
75 box-shadow: 0 0 5px #Cd9035;
76 }
77 }
78
79 .btn-info {
80 background-color: #Cd9035;
81 border-color: #Cd9035;
82 &:focus {
83 box-shadow: none;
84 }
85 &:hover {
86 background-color: #Cd9035;
87 }
88 }
89
90 .btn-primary {
91 background-color: #Cd9035;
92 border-color: #Cd9035;
93 &:focus {
94 box-shadow: none;
95 }
96 &:hover {
97 background-color: #Cd9035;
98 }
99 }
100
101 .table-celda-total {
102 background-color: #E09524;
103 }
104
105 marquee {
106 background-color: #E09524;
107 }
108
50 .front-index{ 109 .front-index{
51 z-index: 9999; 110 z-index: 9999;
52 } 111 }
53 112
54 .uib-daypicker{ 113 .uib-daypicker{
55 outline: 0 114 outline: 0
56 } 115 }
57 116
58 .right-0{ 117 .right-0{
59 right: 0; 118 right: 0;
60 } 119 }
61 120
62 .tabla-factura{ 121 .tabla-factura{
63 word-wrap: break-word; 122 word-wrap: break-word;
64 table-layout: fixed; 123 table-layout: fixed;
65 } 124 }
66 125
67 .ladda-w-100 .ladda-label{ 126 .ladda-w-100 .ladda-label{
68 width: 100%; 127 width: 100%;
69 float: right; 128 float: right;
70 } 129 }
71 130
72 .btn-delete-image{ 131 .btn-delete-image{
73 height: 25px; 132 height: 25px;
74 width: 25px; 133 width: 25px;
75 top: -10px; 134 top: -10px;
76 right: 0; 135 right: 0;
77 } 136 }
78 137
79 button.clear-input{ 138 button.clear-input{
80 cursor: pointer; 139 cursor: pointer;
81 background: transparent; 140 background: transparent;
82 border: none; 141 border: none;
83 margin-left: -24px; 142 margin-left: -24px;
84 z-index: 9; 143 z-index: 9;
85 color: #a3a3a3; 144 color: #a3a3a3;
86 &:focus{ 145 &:focus{
87 outline: none; 146 outline: none;
88 } 147 }
89 } 148 }
90 149