Merge branch 'master' into 'master'

Master(mpuebla) See merge request !1

Merge branch 'master' into 'master'
Master(mpuebla) See merge request !1
Eric Fernandez
2 parents a6d91288cf b5c359d14a
Showing 10 changed files Show diff stats
img/logoMapa.png
img/logoaxion.png
img/logodebo.png
img/logofoca.png
index.html
src/sass/_bootstrap.scss
src/sass/_botonera-principal.scss
src/sass/_contenedor.scss
src/sass/_swiper.scss
src/sass/general.scss
@@ -111,7 +111,7 @@
         <style>
         </style>
         <foca-nombre-empresa></foca-nombre-empresa>
-        <div ng-view class="container contenedor"></div>
+        <div ng-view class="container"></div>
         <div ng-controller="appWrapperFacturadorController" class="teclado-container container d-none d-md-block ">
             <foca-botonera-lateral></foca-botonera-lateral>
             <foca-teclado
@@ -91,3 +91,11 @@ input[type=&quot;number&quot;]::-webkit-outer-spin-button {
 .border-warning {
     border-color: #cd9035 !important;
 }
+
+.rounded-1 {
+    border-radius: .25rem!important;
+}
+
+.rounded-2 {
+    border-radius: .5rem!important;
+}
 \ No newline at end of file
@@ -5,7 +5,7 @@
         text-align: center;
         width: 180px;
         @media (max-width: 576px) {
-            width: 100%;
+            width: 50%;
         }
         @media (min-width: 992px) and (max-width: 1200px) {
             width: 150px;
 body {
-    background-color: #cccccc;
+    background: linear-gradient(0deg, hsl(0, 0%, 70%),hsl(0, 0%, 90%));
 }
  
 .contenedor {
@@ -15,7 +15,7 @@
             height: 430px;
         }
         &-pagination{
-            background: #CCC;
+            background: none;
             padding: 0.5rem;
         }
     }
@@ -378,3 +378,7 @@ button.clear-input {
         transform: translateY(0);
     }
 }
+
+.bg-gray-gradient {    
+    background: linear-gradient(0deg, hsl(0, 0%, 90%),hsl(0, 0%, 70%));
+}
...	...	@@ -111,7 +111,7 @@
111	111	<style>
112	112	</style>
113	113	<foca-nombre-empresa></foca-nombre-empresa>
114		- <div ng-view class="container contenedor"></div>
	114	+ <div ng-view class="container"></div>
115	115	<div ng-controller="appWrapperFacturadorController" class="teclado-container container d-none d-md-block ">
116	116	<foca-botonera-lateral></foca-botonera-lateral>
117	117	<foca-teclado
...	...	@@ -91,3 +91,11 @@ input[type="number"]::-webkit-outer-spin-button {
91	91	.border-warning {
92	92	border-color: #cd9035 !important;
93	93	}
	94	+
	95	+.rounded-1 {
	96	+ border-radius: .25rem!important;
	97	+}
	98	+
	99	+.rounded-2 {
	100	+ border-radius: .5rem!important;
	101	+}
94	102	\ No newline at end of file
...	...	@@ -5,7 +5,7 @@
5	5	text-align: center;
6	6	width: 180px;
7	7	@media (max-width: 576px) {
8		- width: 100%;
	8	+ width: 50%;
9	9	}
10	10	@media (min-width: 992px) and (max-width: 1200px) {
11	11	width: 150px;
1	1	body {
2		- background-color: #cccccc;
	2	+ background: linear-gradient(0deg, hsl(0, 0%, 70%),hsl(0, 0%, 90%));
3	3	}
4	4
5	5	.contenedor {
...	...	@@ -15,7 +15,7 @@
15	15	height: 430px;
16	16	}
17	17	&-pagination{
18		- background: #CCC;
	18	+ background: none;
19	19	padding: 0.5rem;
20	20	}
21	21	}
...	...	@@ -378,3 +378,7 @@ button.clear-input {
378	378	transform: translateY(0);
379	379	}
380	380	}
	381	+
	382	+.bg-gray-gradient {
	383	+ background: linear-gradient(0deg, hsl(0, 0%, 90%),hsl(0, 0%, 70%));
	384	+}