Commit 00724ae53c77000d8e126d4eb6bc3c6924ec9ca0
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
Master (pmarco) See merge request modulos-npm/foca-modal-busqueda-productos!9
Showing
2 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -17,7 +17,12 @@ var paths = { |
| 17 | 17 | dist: 'dist/' |
| 18 | 18 | }; |
| 19 | 19 | |
| 20 | -gulp.task('templates', function() { | |
| 20 | +gulp.task('clean', function() { | |
| 21 | + return gulp.src(['tmp', 'dist'], {read: false}) | |
| 22 | + .pipe(clean()); | |
| 23 | +}); | |
| 24 | + | |
| 25 | +gulp.task('templates', ['clean'], function() { | |
| 21 | 26 | return pump( |
| 22 | 27 | [ |
| 23 | 28 | gulp.src(paths.srcViews), |
| ... | ... | @@ -74,4 +79,8 @@ gulp.task('clean-post-install', function(){ |
| 74 | 79 | .pipe(clean()); |
| 75 | 80 | }); |
| 76 | 81 | |
| 77 | -gulp.task('default', ['webserver']); | |
| 78 | 82 | \ No newline at end of file |
| 83 | +gulp.task('default', ['webserver']); | |
| 84 | + | |
| 85 | +gulp.task('watch', function() { | |
| 86 | + gulp.watch([paths.srcJS, paths.srcViews], ['uglify']) | |
| 87 | +}); |
src/views/modal-busqueda-productos.html
| 1 | -<div class="modal-header"> | |
| 2 | - <h3 class="modal-title">Busqueda de Productos</h3> | |
| 1 | +<div class="modal-header py-1"> | |
| 2 | + <h5 class="modal-title">Busqueda de Productos</h5> | |
| 3 | 3 | </div> |
| 4 | 4 | <div class="modal-body" id="modal-body"> |
| 5 | - <div class="input-group mb-3"> | |
| 6 | - <input | |
| 7 | - type="text" | |
| 8 | - class="form-control" | |
| 9 | - placeholder="Busqueda" | |
| 10 | - ng-model="filters" | |
| 11 | - ng-change="search()" | |
| 5 | + <div class="input-group"> | |
| 6 | + <input | |
| 7 | + type="text" | |
| 8 | + class="form-control" | |
| 9 | + placeholder="Busqueda" | |
| 10 | + ng-model="filters" | |
| 11 | + ng-change="search()" | |
| 12 | 12 | ng-keydown="busquedaDown($event.keyCode)" |
| 13 | 13 | ng-keypress="busquedaPress($event.keyCode)" |
| 14 | 14 | foca-focus="selectedProducto == -1" |
| ... | ... | @@ -33,9 +33,9 @@ |
| 33 | 33 | <td ng-bind="producto.descripcion"></td> |
| 34 | 34 | <td ng-bind="producto.precio | currency"></td> |
| 35 | 35 | <td> |
| 36 | - <button | |
| 36 | + <button | |
| 37 | 37 | type="button" |
| 38 | - class="btn p-2 float-right" | |
| 38 | + class="btn btn-xs p-1 float-right" | |
| 39 | 39 | ng-class="{ |
| 40 | 40 | 'btn-secondary': selectedProducto != key, |
| 41 | 41 | 'btn-primary': selectedProducto == key |
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | </tbody> |
| 51 | 51 | </table> |
| 52 | 52 | <nav> |
| 53 | - <ul class="pagination justify-content-end"> | |
| 53 | + <ul class="pagination pagination-sm justify-content-end mb-0"> | |
| 54 | 54 | <li class="page-item" ng-class="{'disabled': currentPage == 1}"> |
| 55 | 55 | <a class="page-link" href="#" ng-click="selectPage(currentPage - 1)"> |
| 56 | 56 | <span aria-hidden="true">«</span> |
| ... | ... | @@ -58,13 +58,13 @@ |
| 58 | 58 | </a> |
| 59 | 59 | </li> |
| 60 | 60 | <li |
| 61 | - class="page-item" | |
| 62 | - ng-repeat="pagina in paginas" | |
| 61 | + class="page-item" | |
| 62 | + ng-repeat="pagina in paginas" | |
| 63 | 63 | ng-class="{'active': pagina == currentPage}" |
| 64 | 64 | > |
| 65 | - <a | |
| 66 | - class="page-link" | |
| 67 | - href="#" | |
| 65 | + <a | |
| 66 | + class="page-link" | |
| 67 | + href="#" | |
| 68 | 68 | ng-click="selectPage(pagina)" |
| 69 | 69 | ng-bind="pagina" |
| 70 | 70 | ></a> |
| ... | ... | @@ -79,6 +79,6 @@ |
| 79 | 79 | </nav> |
| 80 | 80 | </div> |
| 81 | 81 | </div> |
| 82 | -<div class="modal-footer"> | |
| 83 | - <button class="btn btn-secondary" type="button" ng-click="cancel()">Cancelar</button> | |
| 82 | +<div class="modal-footer py-1"> | |
| 83 | + <button class="btn btn-sm btn-secondary" type="button" ng-click="cancel()">Cancelar</button> | |
| 84 | 84 | </div> |