Mauricio Cattafi / wrapper-demo

Commit d54f55b3ddaec080b1bf1b813cf38646a110a88f

Authored by Eric Fernandez 2019-04-11 13:42:47 -0300

2 parents ab2041e230 7831bd8dbc

Merge branch 'develop' into 'master'

Develop

See merge request !96

Showing 4 changed files Show diff stats

src/sass/_botonera-secundaria.scss

Diff comments View file @ d54f55b

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

Diff comments View file @ d54f55b

 .login {
     background-color: #bdbdbd;
     border: 1px solid #000000;
     border-radius: 3px;
     height: calc(193px + 1em);
     left: calc(50% - 130px);
     opacity: 0.7;
     position: absolute;
     text-align: center;
     top: 190px;
     width: 260px;
     &-titulo {
         border-bottom: 1px solid #ffffff;
         padding: 5px 0;
     }
     &-campo {
         label {
             display: block;
             font-size: 12px;
             margin: 5px 0 0;
         }
         input {
+            -moz-border-radius: 10px;
+            -khtml-border-radius: 10px;
+            -webkit-border-radius: 10px;
+            -webkit-appearance: none;
+            padding-right: 5%;
+            padding-left: 5%;
+            border-radius: 10px;
+            outline: 0;
+            border-color: transparent;
             &:focus {
-                outline: 3px solid #ff9900;
+                border-color: #ff9900;
             }
         }
     }
-    button {
+    &-button {
-        margin-right: 42px;
+        width: 80%;
+        background-color: #cd9035;
+        color: white;
+        &:hover{
+            background-color: #a7743d;
+            color: white
+        }
+        &:focus{
+            color: white;
+        }
     }
     &-alerta-error {
         width: 260px;
         left: calc(50% - 130px);
         top: calc(383px + 1.5em);
     }
 }

src/sass/_teclado.scss

Diff comments View file @ d54f55b

 .keyboard {
     -webkit-touch-callout: none;
     -webkit-user-select: none;
     -khtml-user-select: none;
     -moz-user-select: none;
     -ms-user-select: none;
     user-select: none;
     margin: auto;
-    width: 855px;
+    width: 60%;
-    position: inherit;
+    position: absolute;
     height: auto;
     border: 1px solid rgba(255, 128, 0, .4);
     background-color: rgba(0, 0, 0, .3);
     bottom: 5px;
+    z-index: 100000;
     table {
+        width: auto;
+        height: auto;
+        margin: 0px auto;
         border-spacing: 10px;
         border-collapse: separate;
-        z-index: 100000;
         td {
             touch-action: none;
         }
     }
     .letter {
         background-color: #bdbdbd;
         box-shadow: 2px 2px 3px #555555;
-        width: 47px;
+        padding: 10px;
-        height: 50px;
+        width: auto;
+        height: auto;
         text-align: center;
         font-family: "arial";
         cursor: pointer;
         color: #000;
-        font-size: 22px;
+        font-size: 80%;
         &:hover {
             background-color: #fafafa;
         }
         &:active {
             background-color: #999;
             color: #fff;
         }
     }
     .number {
         background-color: #bdbdbd;
         box-shadow: 2px 2px 3px #555555;
-        width: 47px;
+        padding: 10px;
-        height: 35px;
+        width: auto;
+        height: auto;
         text-align: center;
         font-family: "arial";
         cursor: pointer;
         color: #000;
-        font-size: 22px;
+        font-size: 80%;
         &:hover {
             background-color: #fafafa;
         }
         &:active {
             background-color: #999;
             color: #fff;
         }
     }
     .margin {
-        width: 40px;
+        width: 5%;
-        height: 50px;
+        height: 5%;
     }
 }

src/sass/general.scss

Diff comments View file @ d54f55b

 $primary-color: #e09125;
 @import 'admin-seguimiento';
 @import 'bootstrap';
 @import 'botonera';
 @import 'botonera-lateral';
 @import 'botonera-principal';
 @import 'botonera-secundaria';
 @import 'contenedor';
 @import 'lista';
 @import 'login';
 @import 'panel-informativo';
 @import 'tabla';
 @import 'teclado';
 @import 'tabla-articulos';
 @import 'acciones-mobile';
 @import 'swiper';
 @import 'foca-crear';
 @import 'logistica-pedido-ruta';
 @import 'tabs';
 @import 'grid';
 @import 'paginador-abm';
 //OCULTA FLECHAS INPUT NUMBER
 input[type='number'] {
     -moz-appearance:textfield;
 }
 input::-webkit-outer-spin-button,
 input::-webkit-inner-spin-button {
     -webkit-appearance: none;
 }
 .d-md-grid{
     @media (min-width: 768px) {
         display: grid !important;
     }
 }
 .btn-outline-debo{
     background-color: transparent;
     color: $primary-color;
     border-color: $primary-color;
     &:hover{
         color: #FFF;
         border-color: transparent;
         background-color: $primary-color;
     }
 }
 .front-index{
     z-index: 9999;
 }
 .uib-daypicker{
     outline: 0
 }
 .right-0{
     right: 0;
 }
 .tabla-factura{
     word-wrap: break-word;
     table-layout: fixed;
 }
 .ladda-w-100 .ladda-label{
-    width: 100%
+    width: 100%;
+    float: right;
 }
 .btn-delete-image{
     height: 25px;
     width: 25px;
     top: -10px;
     right: 0;
 }
 button.clear-input{
     cursor: pointer;
     background: transparent;
     border: none;
     margin-left: -24px;
     z-index: 9;
+    color: #a3a3a3;
     &:focus{
         outline: none;
     }
 }