Commit 103e18596e36a5ab499530f49ed5de14f416364f
Exists in
master
and in
1 other branch
Merge branch 'master' into 'develop'
Master See merge request !12
Showing
2 changed files
Show diff stats
package.json
| ... | ... | @@ -33,13 +33,13 @@ |
| 33 | 33 | "gulp-uglify": "^3.0.1", |
| 34 | 34 | "jquery": "^3.3.1", |
| 35 | 35 | "pump": "^3.0.0", |
| 36 | - "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas" | |
| 36 | + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git" | |
| 37 | 37 | }, |
| 38 | 38 | "devDependencies": { |
| 39 | 39 | "angular": "^1.7.5", |
| 40 | 40 | "angular-ladda": "^0.4.3", |
| 41 | 41 | "bootstrap": "^4.1.3", |
| 42 | - "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas", | |
| 42 | + "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", | |
| 43 | 43 | "font-awesome": "^4.7.0", |
| 44 | 44 | "gulp": "^3.9.1", |
| 45 | 45 | "gulp-angular-templatecache": "^2.2.3", |
src/views/foca-modal-nota-pedido.html
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | <input |
| 8 | 8 | ladda="searchLoading" |
| 9 | 9 | type="text" |
| 10 | - class="form-control form-control-sm" | |
| 10 | + class="foca-input form-control form-control-sm" | |
| 11 | 11 | id="search" |
| 12 | 12 | placeholder="Cliente" |
| 13 | 13 | ng-model="filters" |
| ... | ... | @@ -17,6 +17,7 @@ |
| 17 | 17 | foca-focus="selectedNotaPedido == -1" |
| 18 | 18 | ng-focus="selectedNotaPedido = -1" |
| 19 | 19 | teclado-virtual |
| 20 | + uppercase-only | |
| 20 | 21 | /> |
| 21 | 22 | <div class="input-group-append"> |
| 22 | 23 | <button |
| ... | ... | @@ -47,7 +48,7 @@ |
| 47 | 48 | </button> |
| 48 | 49 | </div> |
| 49 | 50 | <input |
| 50 | - class="form-control form-control-sm" | |
| 51 | + class="foca-input form-control form-control-sm" | |
| 51 | 52 | id="inlineFormInputGroup" |
| 52 | 53 | ladda="searchLoading" |
| 53 | 54 | type="text" |
| ... | ... | @@ -73,7 +74,7 @@ |
| 73 | 74 | </button> |
| 74 | 75 | </div> |
| 75 | 76 | <input |
| 76 | - class="form-control form-control-sm" | |
| 77 | + class="foca-input form-control form-control-sm" | |
| 77 | 78 | id="inlineFormInputGroup" |
| 78 | 79 | ladda="searchLoading" |
| 79 | 80 | type="text" |
| ... | ... | @@ -116,12 +117,12 @@ |
| 116 | 117 | class="btn btn-xs p-1 float-right" |
| 117 | 118 | ng-class="{ |
| 118 | 119 | 'btn-secondary': selectedNotaPedido != key, |
| 119 | - 'btn-primary': selectedNotaPedido == key | |
| 120 | + 'btn-brown': selectedNotaPedido == key | |
| 120 | 121 | }" |
| 121 | 122 | foca-focus="selectedNotaPedido == {{key}}" |
| 122 | 123 | ng-keydown="itemNotaPedido($event.keyCode)" |
| 123 | 124 | > |
| 124 | - <i class="fa fa-circle-thin" aria-hidden="true"></i> | |
| 125 | + <i class="fa fa-circle-thin icon-white" aria-hidden="true"></i> | |
| 125 | 126 | </button> |
| 126 | 127 | </td> |
| 127 | 128 | </tr> |