Commit 6d73517ebfe0fdd1829c34c6f690ea62f79b60b1

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

Merge branch 'master' into 'develop'

Master(mpuebla)

agregada también imágenes.

See merge request !149
img/cuentaCorriente.png

8.21 KB

9.5 KB

src/sass/_bootstrap.scss
1 button.active{ 1 button.active {
2 text-decoration: none; 2 text-decoration: none;
3 outline: 0; 3 outline: 0;
4 color: white; 4 color: white;
5 background-color: $primary; 5 background-color: $primary;
6 &:focus{ 6 &:focus {
7 box-shadow: 0 0 0 0.2rem $primaryTransparency; 7 box-shadow: 0 0 0 0.2rem $primaryTransparency;
8 } 8 }
9 } 9 }
10 .btn-xs { 10 .btn-xs {
11 padding: .15rem .5rem; 11 padding: 0.15rem 0.5rem;
12 font-size: .8rem; 12 font-size: 0.8rem;
13 line-height: 1.5; 13 line-height: 1.5;
14 border-radius: .2rem; 14 border-radius: 0.2rem;
15 } 15 }
16 16
17 .no-border-bottom { 17 .no-border-bottom {
18 border-bottom: 0 !important; 18 border-bottom: 0 !important;
19 } 19 }
20 .no-border-top { 20 .no-border-top {
21 border-top: 0 !important; 21 border-top: 0 !important;
22 } 22 }
23 .no-border { 23 .no-border {
24 border: 0 !important; 24 border: 0 !important;
25 } 25 }
26 .margin-bottom-mobile { 26 .margin-bottom-mobile {
27 margin-bottom: 2.5em !important; 27 margin-bottom: 2.5em !important;
28 } 28 }
29 .tamaño-boton { 29 .tamaño-boton {
30 width:44px; 30 width: 44px;
31 } 31 }
32 .modal-content { 32 .modal-content {
33 .modal-header{ 33 .modal-header {
34 display: block; 34 display: block;
35 >div.row{ 35 > div.row {
36 margin: 0 !important; 36 margin: 0 !important;
37 >div{ 37 > div {
38 padding: 0 !important; 38 padding: 0 !important;
39 } 39 }
40 } 40 }
41 } 41 }
42 @media (max-width: 576px) { 42 @media (max-width: 576px) {
43 height: auto; 43 height: auto;
44 height: 100%; 44 height: 100%;
45 border-radius: 0; 45 border-radius: 0;
46 } 46 }
47 } 47 }
48 .modal.show .modal-dialog { 48 .modal.show .modal-dialog {
49 @media (min-width: 1201px){ 49 @media (min-width: 1201px) {
50 -webkit-transform: translate(0, 70px); 50 -webkit-transform: translate(0, 70px);
51 transform: translate(0, 70px); 51 transform: translate(0, 70px);
52 } 52 }
53 @media (min-width: 576px) { 53 @media (min-width: 576px) {
54 -webkit-transform: translate(0, 90px); 54 -webkit-transform: translate(0, 90px);
55 transform: translate(0, 90px); 55 transform: translate(0, 90px);
56 } 56 }
57 @media (max-width: 576px) { 57 @media (max-width: 576px) {
58 width: 100%; 58 width: 100%;
59 height: 100%; 59 height: 100%;
60 margin: 0; 60 margin: 0;
61 padding: 0; 61 padding: 0;
62 } 62 }
63 } 63 }
64 .modal-body { 64 .modal-body {
65 @media (max-width: 576px) { 65 @media (max-width: 576px) {
66 overflow-y: auto; 66 overflow-y: auto;
67 } 67 }
68 } 68 }
69 69
70 .boton-salir { 70 .boton-salir {
71 position: absolute; 71 position: absolute;
72 bottom: 10px; 72 bottom: 10px;
73 right: 15px; 73 right: 15px;
74 width: calc(100% - 15px); 74 width: calc(100% - 15px);
75 } 75 }
76 76
77 input[type=number]::-webkit-inner-spin-button, 77 input[type="number"]::-webkit-inner-spin-button,
78 78 input[type="number"]::-webkit-outer-spin-button {
79 input[type=number]::-webkit-outer-spin-button { 79 -webkit-appearance: none;
80 -webkit-appearance: none; 80 margin: 0;
81 margin: 0;
82 } 81 }
83 82
84 .invisible { 83 .invisible {
85 color: rgba(0,0,0,0); 84 color: rgba(0, 0, 0, 0);
85 }
86
87 .badge-success {
88 background-color: #9aae47 !important;
89 }
90
91 .border-warning {
92 border-color: #cd9035 !important;
86 } 93 }
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 &:hover{ 13 &:hover{
14 background-color: #cd903550 ; 14 background-color: #cd903550 ;
15 border-color: #cd9035 !important; 15 border-color: #cd9035 !important;
16 } 16 }
17 &:focus{ 17 &:focus{
18 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125); 18 box-shadow: 0 0 0 0.2rem rgb(216, 176, 125);
19 } 19 }
20 img{ 20 img{
21 width: 40%; 21 width: 40%;
22 margin: auto 22 margin: auto
23 } 23 }
24 span{ 24 span{
25 font-size: 11px; 25 font-size: 11px;
26 margin-left: -.25rem; 26 margin-left: -.25rem;
27 margin-right: -.25rem; 27 margin-right: -.25rem;
28 } 28 }
29 } 29 }
30 .btn-tarjeta { 30 .btn-tarjeta {
31 border-width: 3px !important; 31 border-width: 3px !important;
32 border-radius: .7rem !important; 32 border-radius: .7rem !important;
33 &:hover{ 33 &:hover{
34 background-color: #cd903550 ; 34 background-color: #cd903550 ;
35 border-color: #cd9035 !important; 35 border-color: #cd9035 !important;
36 } 36 }
37 &:focus{ 37 &:focus{
38 box-shadow: none; 38 box-shadow: none;
39 border-color: #cd9035 !important;
39 } 40 }
40 img{ 41 img{
41 width: 5em; 42 width: 5em;
42 margin: auto 43 margin: auto
43 } 44 }
44 } 45 }
45 @media(max-width: 992px){ 46 @media(max-width: 992px){
46 .btn-xs{ 47 .btn-xs{
47 font-weight: 700; 48 font-weight: 700;
48 } 49 }
49 } 50 }
50 @media(min-width: 1200px){ 51 @media(min-width: 1200px){
51 .btn-xs{ 52 .btn-xs{
52 height: 85px !important; 53 height: 85px !important;
53 } 54 }
54 .foca-facturador-px{ 55 .foca-facturador-px{
55 padding-left: 3rem; 56 padding-left: 3rem;
56 padding-right: 3rem; 57 padding-right: 3rem;
57 } 58 }
58 } 59 }
59 60
60 @media(min-width: 992px) and (max-width: 1200px){ 61 @media(min-width: 992px) and (max-width: 1200px){
61 .btn-xs{ 62 .btn-xs{
62 height: 73px !important; 63 height: 73px !important;
63 } 64 }
64 } 65 }
65 66
66 @media(min-width: 768px) and (max-width: 992px){ 67 @media(min-width: 768px) and (max-width: 992px){
67 .btn-xs{ 68 .btn-xs{
68 height: 62px !important; 69 height: 62px !important;
69 } 70 }
70 } 71 }
71 72
72 @media(min-width: 576px) and (max-width: 768px){ 73 @media(min-width: 576px) and (max-width: 768px){
73 .btn-xs{ 74 .btn-xs{
74 max-height: 51px; 75 max-height: 51px;
75 } 76 }
76 } 77 }
77 78
78 @media(max-width: 576px) { 79 @media(max-width: 576px) {
79 .btn-xs{ 80 .btn-xs{
80 max-height: 22vw; 81 max-height: 22vw;
81 } 82 }
82 } 83 }
83 84
84 } 85 }
85 .foca-overflow-hidden{ 86 .foca-overflow-hidden{
86 overflow: hidden; 87 overflow: hidden;
87 text-overflow: ellipsis; 88 text-overflow: ellipsis;
88 white-space: nowrap; 89 white-space: nowrap;
89 } 90 }
90 91
91 .foca-boton-facturador-right { 92 .foca-boton-facturador-right {
92 right: 5; 93 right: 5;
93 } 94 }
94 95