Commit 0ef5d3052c0653add9ae829248ea101666b85525
Exists in
develop
Merge branch 'master' into 'develop'
Master(benjamin) See merge request !21
Showing
3 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -38,11 +38,11 @@ gulp.task('uglify', ['templates'], function() { |
| 38 | 38 | paths.srcJS, |
| 39 | 39 | 'tmp/views.js' |
| 40 | 40 | ]), |
| 41 | - concat('foca-modal-domicilios.js'), | |
| 41 | + concat('foca-modal-domicilio.js'), | |
| 42 | 42 | replace('src/views/', ''), |
| 43 | 43 | replace("['ui.bootstrap', 'focaDirectivas', 'focaModal']", '[]'), |
| 44 | 44 | gulp.dest(paths.tmp), |
| 45 | - rename('foca-modal-domicilios.min.js'), | |
| 45 | + rename('foca-modal-domicilio.min.js'), | |
| 46 | 46 | uglify(), |
| 47 | 47 | gulp.dest(paths.dist) |
| 48 | 48 | ] |
package.json
| ... | ... | @@ -3,6 +3,7 @@ |
| 3 | 3 | "version": "0.0.1", |
| 4 | 4 | "description": "Modal para busqueda de domicilios", |
| 5 | 5 | "scripts": { |
| 6 | + "refresh": "gulp uglify && cp tmp/foca-modal-domicilio.js ../wrapper-demo/node_modules/foca-modal-domicilio/dist/foca-modal-domicilio.min.js", | |
| 6 | 7 | "test": "echo \"Error: no test specified\" && exit 1", |
| 7 | 8 | "gulp-pre-commit": "gulp pre-commit", |
| 8 | 9 | "compile": "gulp uglify", |
src/views/modal-domicilio.html
| 1 | 1 | <div class="modal-header py-1"> |
| 2 | - <div class="row w-100"> | |
| 3 | - <div class="col-lg-6"> | |
| 2 | + <div class="row w-100 justify-content-between"> | |
| 3 | + <div class="col-auto"> | |
| 4 | 4 | <h5 class="modal-title my-1" ng-hide="ingreso">Búsqueda de Domicilios</h5> |
| 5 | 5 | <h5 class="modal-title my-1" ng-show="ingreso">Crear domicilios de descarga</h5> |
| 6 | 6 | </div> |
| 7 | - <div class="input-group col-lg-6 pr-0 my-2"> | |
| 7 | + <div class="col-auto pr-0 my-2"> | |
| 8 | 8 | <button |
| 9 | 9 | class="btn btn-outline-debo mr-2" |
| 10 | 10 | ng-click="ingreso = true" |
| ... | ... | @@ -12,29 +12,6 @@ |
| 12 | 12 | title="Nuevo"> |
| 13 | 13 | <i class="fa fa-plus" aria-hidden="true"></i> |
| 14 | 14 | </button> |
| 15 | - <input | |
| 16 | - type="text" | |
| 17 | - class="form-control form-control-sm" | |
| 18 | - id="search" | |
| 19 | - placeholder="Búsqueda" | |
| 20 | - ng-model="filters" | |
| 21 | - ng-change="search()" | |
| 22 | - ng-keydown="busquedaDown($event.keyCode)" | |
| 23 | - ng-keypress="busquedaPress($event.keyCode)" | |
| 24 | - foca-focus="selectedDomicilio == -1" | |
| 25 | - ng-focus="selectedDomicilio = -1" | |
| 26 | - teclado-virtual | |
| 27 | - > | |
| 28 | - <div class="input-group-append"> | |
| 29 | - <button | |
| 30 | - ladda="searchLoading" | |
| 31 | - class="btn btn-outline-secondary" | |
| 32 | - type="button" | |
| 33 | - ng-click="busquedaPress(13)" | |
| 34 | - > | |
| 35 | - <i class="fa fa-search" aria-hidden="true"></i> | |
| 36 | - </button> | |
| 37 | - </div> | |
| 38 | 15 | </div> |
| 39 | 16 | </div> |
| 40 | 17 | </div> |