Jose Pinto / wrapper-demo

Download as
Browse Code ยป

Commit 24fd023ca6a63c4dd54a5f0c5bc046d0e7d202ac

Authored by Jose Pinto
2 parents 95a18f6203 d3b00e0335
Exists in master

Merge branch 'master' into 'develop' 

Master(efernandez)

See merge request !90
Showing 6 changed files   Show diff stats
img/agendarInformes.png
View file @ 24fd023

2.66 KB
img/agendarVisita.png
Diff comments   View file @ 24fd023

1.65 KB | W: | H:

4.07 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
img/botonObservaciones.png
Diff comments   View file @ 24fd023

16.2 KB | W: | H:

11.8 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin

4.82 KB
... ... @@ -21,19 +21,19 @@
21 21 "author": "Foca Software",
22 22 "license": "ISC",
23 23 "dependencies": {
24   - "angular": "^1.7.7",
  24 + "angular": "^1.7.8",
25 25 "angular-chart.js": "1.1.1",
26   - "angular-cookies": "^1.7.7",
  26 + "angular-cookies": "^1.7.8",
27 27 "angular-file-saver": "^1.1.3",
28   - "angular-i18n": "^1.7.7",
  28 + "angular-i18n": "^1.7.8",
29 29 "angular-ladda": "^0.4.3",
30 30 "angular-md5": "^0.1.10",
31   - "angular-mocks": "^1.7.7",
32   - "angular-route": "^1.7.7",
33   - "angular-sanitize": "^1.7.7",
  31 + "angular-mocks": "^1.7.8",
  32 + "angular-route": "^1.7.8",
  33 + "angular-sanitize": "^1.7.8",
34 34 "angular-ui-grid": "4.6.6",
35 35 "angular-ui-swiper": "^2.3.8",
36   - "bootstrap": "^4.2.1",
  36 + "bootstrap": "^4.3.1",
37 37 "chart.js": "2.7.3",
38 38 "excel-builder": "2.0.3",
39 39 "foca-abm-chofer": "git+ssh://git@debonline.dyndns.org:npm/foca-abm-chofer.git",
... ... @@ -95,7 +95,6 @@
95 95 "gulp-angular-templatecache": "^2.2.6",
96 96 "gulp-htmlmin": "^5.0.1",
97 97 "gulp-sequence": "^1.0.0",
98   - "gulp-uglify": "^3.0.1",
99 98 "gulp-uglify-es": "^1.0.4",
100 99 "jquery": "^3.3.1",
101 100 "jszip": "2.6.1",
... ... @@ -118,10 +117,10 @@
118 117 "gulp-rename": "^1.4.0",
119 118 "gulp-replace": "^1.0.0",
120 119 "gulp-sass": "^4.0.1",
121   - "gulp-uglify": "^1.0.4",
  120 + "gulp-uglify": "^3.0.2",
122 121 "gulp-watch": "^5.0.1",
123 122 "jasmine-core": "^3.3.0",
124   - "jshint": "^2.10.1",
  123 + "jshint": "^2.10.2",
125 124 "pre-commit": "^1.2.2",
126 125 "pump": "^3.0.0"
127 126 }
src/sass/_botonera-principal.scss
Diff comments   View file @ 24fd023
... ... @@ -191,7 +191,7 @@
191 191 }
192 192 &-informes {
193 193 & button {
194   - background-image: url('../img/agendarInformes.png');
  194 + background-image: url('../img/informes.png');
195 195 background-size: 90px 90px;
196 196 &:hover {
197 197 background-color: rgb(250,250,250);