Merge remote-tracking branch 'upstream/master'

Jose Pinto
2 parents a2cc614fb9 d0140f227c
Showing 2 changed files Show diff stats
package.json
src/views/botonera-facturador.html
@@ -34,26 +34,26 @@
     "pump": "^3.0.x"
   },
   "devDependencies": {
-    "angular": "1.7.5",
+    "angular": "^1.7.5",
     "angular-route": "^1.7.5",
-    "angular-sanitize": "1.7.5",
-    "bootstrap": "4.1.3",
-    "font-awesome": "4.7.0",
-    "gulp": "3.9.1",
-    "gulp-angular-templatecache": "2.2.5",
-    "gulp-clean": "0.4.0",
-    "gulp-concat": "2.6.1",
-    "gulp-connect": "5.6.1",
-    "gulp-htmlmin": "5.0.1",
-    "gulp-jshint": "2.1.0",
-    "gulp-rename": "1.4.0",
-    "gulp-replace": "1.0.0",
-    "gulp-sass": "4.0.2",
-    "gulp-uglify-es": "1.0.4",
-    "jasmine-core": "3.3.0",
-    "jquery": "3.3.1",
-    "jshint": "2.9.6",
-    "pre-commit": "1.2.2",
-    "pump": "3.0.0"
+    "angular-sanitize": "^1.7.5",
+    "bootstrap": "^4.1.3",
+    "font-awesome": "^4.7.0",
+    "gulp": "^3.9.1",
+    "gulp-angular-templatecache": "^2.2.5",
+    "gulp-clean": "^0.4.0",
+    "gulp-concat": "^2.6.1",
+    "gulp-connect": "^5.6.1",
+    "gulp-htmlmin": "^5.0.1",
+    "gulp-jshint": "^2.1.0",
+    "gulp-rename": "^1.4.0",
+    "gulp-replace": "^1.0.0",
+    "gulp-sass": "^4.0.2",
+    "gulp-uglify-es": "^1.0.4",
+    "jasmine-core": "^3.3.0",
+    "jquery": "^3.3.1",
+    "jshint": "^2.9.6",
+    "pre-commit": "^1.2.2",
+    "pump": "^3.0.0"
   }
 }
-<div 
-    class="col-6 col-sm-2 px-1 py-1 m-auto m-md-0" 
+<div
+    class="col-4 col-sm-2 px-1 py-1 m-auto m-md-0"
     ng-repeat="boton in botones track by $index"
     ng-class="{'d-none d-md-grid': boton == ''}">
     <button
...	...	@@ -34,26 +34,26 @@
34	34	"pump": "^3.0.x"
35	35	},
36	36	"devDependencies": {
37		- "angular": "1.7.5",
	37	+ "angular": "^1.7.5",
38	38	"angular-route": "^1.7.5",
39		- "angular-sanitize": "1.7.5",
40		- "bootstrap": "4.1.3",
41		- "font-awesome": "4.7.0",
42		- "gulp": "3.9.1",
43		- "gulp-angular-templatecache": "2.2.5",
44		- "gulp-clean": "0.4.0",
45		- "gulp-concat": "2.6.1",
46		- "gulp-connect": "5.6.1",
47		- "gulp-htmlmin": "5.0.1",
48		- "gulp-jshint": "2.1.0",
49		- "gulp-rename": "1.4.0",
50		- "gulp-replace": "1.0.0",
51		- "gulp-sass": "4.0.2",
52		- "gulp-uglify-es": "1.0.4",
53		- "jasmine-core": "3.3.0",
54		- "jquery": "3.3.1",
55		- "jshint": "2.9.6",
56		- "pre-commit": "1.2.2",
57		- "pump": "3.0.0"
	39	+ "angular-sanitize": "^1.7.5",
	40	+ "bootstrap": "^4.1.3",
	41	+ "font-awesome": "^4.7.0",
	42	+ "gulp": "^3.9.1",
	43	+ "gulp-angular-templatecache": "^2.2.5",
	44	+ "gulp-clean": "^0.4.0",
	45	+ "gulp-concat": "^2.6.1",
	46	+ "gulp-connect": "^5.6.1",
	47	+ "gulp-htmlmin": "^5.0.1",
	48	+ "gulp-jshint": "^2.1.0",
	49	+ "gulp-rename": "^1.4.0",
	50	+ "gulp-replace": "^1.0.0",
	51	+ "gulp-sass": "^4.0.2",
	52	+ "gulp-uglify-es": "^1.0.4",
	53	+ "jasmine-core": "^3.3.0",
	54	+ "jquery": "^3.3.1",
	55	+ "jshint": "^2.9.6",
	56	+ "pre-commit": "^1.2.2",
	57	+ "pump": "^3.0.0"
58	58	}
59	59	}
1		-<div
2		- class="col-6 col-sm-2 px-1 py-1 m-auto m-md-0"
	1	+<div
	2	+ class="col-4 col-sm-2 px-1 py-1 m-auto m-md-0"
3	3	ng-repeat="boton in botones track by $index"
4	4	ng-class="{'d-none d-md-grid': boton == ''}">
5	5	<button