Merge branch 'master' into 'master'

Master See merge request !27

Merge branch 'master' into 'master'
Master See merge request !27
Jose Pinto
2 parents 3bee3d1473 2f475a32e3
Showing 4 changed files Show diff stats
index.html
src/sass/_botonera-lateral.scss
src/sass/_botonera-principal.scss
src/sass/_swiper.scss
@@ -87,15 +87,7 @@
         <foca-nombre-empresa></foca-nombre-empresa>
         <div ng-view class="container contenedor"></div>
         <div ng-controller="appWrapperDemoController" class="teclado-container container d-none d-md-block ">
-            <div class="container">
-                <div class="row">
-                    <div class="col-auto my-2 col-lg-2 offset-lg-10 d-none d-md-flex" style="min-height: 176px">
-                        <div class="px-2 mt-auto">
-                            <foca-botonera-lateral></foca-botonera-lateral>
-                        </div>
-                    </div>
-                </div>
-            </div>
+            <foca-botonera-lateral></foca-botonera-lateral>
             <foca-teclado
                 ng-show="usarTeclado && mostrarTeclado"
                 alfanumeric="true"
 .botonera-lateral {
+    pointer-events: none;
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 402px;
+    &.teclado{
+        top: 449px;
+        z-index: 100000;
+    }
+    .row{
+        margin: 0 !important;
+        pointer-events: none;
+    }
  
-    @media (min-width: 768px){
-        display: grid !important;
+    .container{
+        @media (min-width: 768px){
+            display: grid !important;
+        }
     }
  
     button{
@@ -49,16 +64,3 @@
         }
     }
 }
-.teclado-container > div{
-    pointer-events: none;
-    position: absolute;
-    z-index: 100000;
-    left: 0;
-    right: 0;
-    top: 449px;
-    .row{
-        margin: 0 !important;
-        pointer-events: none;
-    }
-    
-}
@@ -7,6 +7,9 @@
         @media (max-width: 576px) {
             width: 100%;
         }
+        @media (min-width: 992px) and (max-width: 1200px){
+            width: 150px;
+        }
     }
     button {
         background-image: url('../img/botonera.png');
@@ -26,6 +29,7 @@
         }
     }
     &-menu {
+        width: 100%;
         padding-left: 90px;
         @media (max-width: 576px) {
             padding: 0;
@@ -187,4 +191,10 @@
     .swiper-button-prev {
         background-image: url('../img/izquierda.png');
     }
+
+    @media (min-width: 992px){
+        a{
+            margin-top: 2.5rem;
+        }
+    }
 }
 .swiper {
     &-container {
         height: 300px;
+        
     }
     &-slide {
         background: transparent;
@@ -9,4 +10,14 @@
         -webkit-align-items: unset;
         align-items: unset;
     }
+
+    @media(max-width: 992px){
+        &-container{
+            height: 430px;
+        }
+        &-pagination{
+            background: #CCC;
+            padding: 0.5rem;
+        }
+    }
 }
...	...	@@ -87,15 +87,7 @@
87	87	<foca-nombre-empresa></foca-nombre-empresa>
88	88	<div ng-view class="container contenedor"></div>
89	89	<div ng-controller="appWrapperDemoController" class="teclado-container container d-none d-md-block ">
90		- <div class="container">
91		- <div class="row">
92		- <div class="col-auto my-2 col-lg-2 offset-lg-10 d-none d-md-flex" style="min-height: 176px">
93		- <div class="px-2 mt-auto">
94		- <foca-botonera-lateral></foca-botonera-lateral>
95		- </div>
96		- </div>
97		- </div>
98		- </div>
	90	+ <foca-botonera-lateral></foca-botonera-lateral>
99	91	<foca-teclado
100	92	ng-show="usarTeclado && mostrarTeclado"
101	93	alfanumeric="true"
1	1	.botonera-lateral {
	2	+ pointer-events: none;
	3	+ position: absolute;
	4	+ left: 0;
	5	+ right: 0;
	6	+ top: 402px;
	7	+ &.teclado{
	8	+ top: 449px;
	9	+ z-index: 100000;
	10	+ }
	11	+ .row{
	12	+ margin: 0 !important;
	13	+ pointer-events: none;
	14	+ }
2	15
3		- @media (min-width: 768px){
4		- display: grid !important;
	16	+ .container{
	17	+ @media (min-width: 768px){
	18	+ display: grid !important;
	19	+ }
5	20	}
6	21
7	22	button{
...	...	@@ -49,16 +64,3 @@
49	64	}
50	65	}
51	66	}
52		-.teclado-container > div{
53		- pointer-events: none;
54		- position: absolute;
55		- z-index: 100000;
56		- left: 0;
57		- right: 0;
58		- top: 449px;
59		- .row{
60		- margin: 0 !important;
61		- pointer-events: none;
62		- }
63		-
64		-}
...	...	@@ -7,6 +7,9 @@
7	7	@media (max-width: 576px) {
8	8	width: 100%;
9	9	}
	10	+ @media (min-width: 992px) and (max-width: 1200px){
	11	+ width: 150px;
	12	+ }
10	13	}
11	14	button {
12	15	background-image: url('../img/botonera.png');
...	...	@@ -26,6 +29,7 @@
26	29	}
27	30	}
28	31	&-menu {
	32	+ width: 100%;
29	33	padding-left: 90px;
30	34	@media (max-width: 576px) {
31	35	padding: 0;
...	...	@@ -187,4 +191,10 @@
187	191	.swiper-button-prev {
188	192	background-image: url('../img/izquierda.png');
189	193	}
	194	+
	195	+ @media (min-width: 992px){
	196	+ a{
	197	+ margin-top: 2.5rem;
	198	+ }
	199	+ }
190	200	}
1	1	.swiper {
2	2	&-container {
3	3	height: 300px;
	4	+
4	5	}
5	6	&-slide {
6	7	background: transparent;
...	...	@@ -9,4 +10,14 @@
9	10	-webkit-align-items: unset;
10	11	align-items: unset;
11	12	}
	13	+
	14	+ @media(max-width: 992px){
	15	+ &-container{
	16	+ height: 430px;
	17	+ }
	18	+ &-pagination{
	19	+ background: #CCC;
	20	+ padding: 0.5rem;
	21	+ }
	22	+ }
12	23	}