Martin Macola / configuracion-imagenes

Download as
Browse Code ยป

Commit a3885a7334320c8ad72ea599438973a600d0b2f4

Authored by Eric Fernandez
2 parents d4fc5824a7 b8d71e9155
Exists in master

Merge branch 'master' into 'master' 

Master(mpuebla)

See merge request !2
Showing 9 changed files   Show diff stats
... ... @@ -29,6 +29,7 @@
29 29 ],
30 30 "styles": [
31 31 "./node_modules/bootstrap/dist/css/bootstrap.min.css",
  32 + "./node_modules/font-awesome/css/font-awesome.min.css",
32 33 "src/styles.scss"
33 34 ],
34 35 "scripts": [
... ... @@ -4089,6 +4089,11 @@
4089 4089 }
4090 4090 }
4091 4091 },
  4092 + "font-awesome": {
  4093 + "version": "4.7.0",
  4094 + "resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
  4095 + "integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
  4096 + },
4092 4097 "for-in": {
4093 4098 "version": "1.0.2",
4094 4099 "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
... ... @@ -20,6 +20,7 @@
20 20 "@angular/platform-browser-dynamic": "~8.2.0",
21 21 "@angular/router": "~8.2.0",
22 22 "bootstrap": "^4.3.1",
  23 + "font-awesome": "^4.7.0",
23 24 "jquery": "^3.4.1",
24 25 "ngx-bootstrap": "^5.1.1",
25 26 "popper.js": "^1.15.0",
src/app/components/abm-imagenes/abm-imagenes.component.html
Diff comments   View file @ a3885a7
... ... @@ -55,8 +55,8 @@
55 55 <button
56 56 (click)="deleteImage(articulo.imagenes, index)"
57 57 type="button"
58   - class="btn btn-light btn-delete-image position-absolute close">
59   - <span aria-hidden="true">&times;</span>
  58 + class="btn btn-lg btn-delete-image position-absolute">
  59 + <i class="fa fa-trash text-dark" aria-hidden="true"></i>
60 60 </button>
61 61 </slide>
62 62 </carousel>
src/app/components/abm-imagenes/abm-imagenes.component.scss
Diff comments   View file @ a3885a7
... ... @@ -14,5 +14,13 @@
14 14  
15 15 .btn-delete-image {
16 16 top: 0;
17   - left: 95%;
  17 + left: 88%;
  18 + z-index: 1000;
  19 + outline: none;
  20 +}
  21 +
  22 +.btn:focus {
  23 + color: gray;
  24 + outline: 0;
  25 + box-shadow: none;
18 26 }
src/app/components/header/header.component.html
Diff comments   View file @ a3885a7
1 1 <div class="row m-0 bg-light p-4 justify-content-between">
2   - <div class="col-6">
  2 + <!-- <div class="col-6">
3 3 <img class="w-25 float-left" src="{{apiImagenes}}/imagenes/logoempresa.png">
4   - </div>
5   - <div class="col-6">
  4 + </div> -->
  5 + <div class="col-6 offset-6">
6 6 <img class="w-25 float-right" src="{{apiImagenes}}/imagenes/logodebo.png">
7 7 </div>
8 8 </div>
src/assets/scss/bootstrap-override.scss
Diff comments   View file @ a3885a7
... ... @@ -68,15 +68,25 @@ $theme-colors: (
68 68 }
69 69 }
70 70  
71   -.carousel-control {
72   - visibility: hidden !important;
73   -}
74   -
75   -.carousel, .carousel-inner, .item {
  71 +.carousel,
  72 +.carousel-inner,
  73 +.item {
76 74 height: 100% !important;
77   - &:focus{
  75 + &:focus {
78 76 outline: none !important;
79 77 }
80 78 }
81 79  
  80 +.carousel-control-prev-icon {
  81 + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23808080' viewBox='0 0 8 8'%3E%3Cpath d='M5.25 0l-4 4 4 4 1.5-1.5-2.5-2.5 2.5-2.5-1.5-1.5z'/%3E%3C/svg%3E") !important;
  82 +}
  83 +
  84 +.carousel-control-next-icon {
  85 + background-image: url("data:image/svg+xml;charset=utf8,%3Csvg xmlns='http://www.w3.org/2000/svg' fill='%23808080' viewBox='0 0 8 8'%3E%3Cpath d='M2.75 0l-1.5 1.5 2.5 2.5-2.5 2.5 1.5 1.5 4-4-4-4z'/%3E%3C/svg%3E") !important;
  86 +}
  87 +
  88 +.carousel-indicators li {
  89 + background-color: #808080 !important;
  90 +}
  91 +
82 92 @import "../../../node_modules/bootstrap/scss/bootstrap";
No preview for this file type
... ... @@ -6,7 +6,7 @@ html,
6 6 body {
7 7 background-color: #f0f0f0;
8 8 font-family: bahnschrift;
9   - overflow: hidden !important;
  9 + // overflow: hidden !important;
10 10 }
11 11  
12 12 .disable-user-select {