Commit f83339a06b91e304cb74f01ae93d7f6e83dec050
Exists in
master
and in
2 other branches
Merge remote-tracking branch 'upstream/master'
Showing
2 changed files
Show diff stats
package.json
| ... | ... | @@ -34,16 +34,16 @@ |
| 34 | 34 | "pump": "^3.0.x" |
| 35 | 35 | }, |
| 36 | 36 | "devDependencies": { |
| 37 | - "angular": "^1.7.5", | |
| 37 | + "angular": "^1.7.6", | |
| 38 | 38 | "angular-route": "^1.7.5", |
| 39 | - "angular-sanitize": "^1.7.5", | |
| 40 | - "bootstrap": "^4.1.3", | |
| 39 | + "angular-sanitize": "^1.7.6", | |
| 40 | + "bootstrap": "^4.2.1", | |
| 41 | 41 | "font-awesome": "^4.7.0", |
| 42 | 42 | "gulp": "^3.9.1", |
| 43 | - "gulp-angular-templatecache": "^2.2.5", | |
| 43 | + "gulp-angular-templatecache": "^2.2.6", | |
| 44 | 44 | "gulp-clean": "^0.4.0", |
| 45 | 45 | "gulp-concat": "^2.6.1", |
| 46 | - "gulp-connect": "^5.6.1", | |
| 46 | + "gulp-connect": "^5.7.0", | |
| 47 | 47 | "gulp-htmlmin": "^5.0.1", |
| 48 | 48 | "gulp-jshint": "^2.1.0", |
| 49 | 49 | "gulp-rename": "^1.4.0", |
| ... | ... | @@ -52,7 +52,7 @@ |
| 52 | 52 | "gulp-uglify-es": "^1.0.4", |
| 53 | 53 | "jasmine-core": "^3.3.0", |
| 54 | 54 | "jquery": "^3.3.1", |
| 55 | - "jshint": "^2.9.6", | |
| 55 | + "jshint": "^2.9.7", | |
| 56 | 56 | "pre-commit": "^1.2.2", |
| 57 | 57 | "pump": "^3.0.0" |
| 58 | 58 | } |
src/views/botonera-facturador.html
| 1 | 1 | <div |
| 2 | - class="col-4 col-sm-2 px-1 py-1 m-auto m-md-0" | |
| 2 | + class="col-3 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 |
| 6 | 6 | type="button" |
| 7 | - class="btn btn-default btn-block btn-xs text-center py-1 rounded border border-light" | |
| 7 | + class="btn btn-default btn-block btn-xs text-center py-1 rounded border border-light foca-overflow-hidden" | |
| 8 | 8 | ng-click="(boton != '') ? ejecutarFuncion(boton.label) : null" |
| 9 | 9 | ng-class="{'d-sm-block h-100': boton == ''}" |
| 10 | 10 | > |
| 11 | - <img ng-src="../img/{{boton.image}}" alt=""> | |
| 11 | + <img ng-src="./img/{{boton.image}}" alt=""> | |
| 12 | 12 | <span>{{boton.label}}</span> |
| 13 | 13 | </button> |
| 14 | 14 | </div> |