Merge branch 'develop' into 'master'

Develop See merge request !137

Merge branch 'develop' into 'master'
Develop See merge request !137
Eric Fernandez
2 parents 76a7a1b037 f4f3695add
Showing 7 changed files Show diff stats
img/detalleDeCarga.png
img/dimiciliodeentrega.png
img/domicilioDeEntrega.png
img/eliminarRemito.png
img/nuevoCliente.png
img/resumen.png
src/sass/general.scss
@@ -68,6 +68,10 @@ input::-webkit-inner-spin-button {
     }
 }
  
+.alert {
+    white-space:pre-wrap
+}
+
 .input-group-append > button {
     &:focus {
         border-color: $primary !important;
...	...	@@ -68,6 +68,10 @@ input::-webkit-inner-spin-button {
68	68	}
69	69	}
70	70
	71	+.alert {
	72	+ white-space:pre-wrap
	73	+}
	74	+
71	75	.input-group-append > button {
72	76	&:focus {
73	77	border-color: $primary !important;