Commit 5e33ef41d3194735a9673022959a74a89150e590
1 parent
85c4fcb861
Exists in
develop
arreglo de commit
Showing
2 changed files
with
1 additions
and
9 deletions
Show diff stats
src/app/modules/seleccion-articulos/seleccion-articulos.component.scss
src/app/shared/footer/footer.component.html
| 1 | 1 | <div class="row w-90 mx-auto h-100 justify-content-between bg-white"> |
| 2 | 2 | <div class="col-auto align-self-center px-0 bg-white"> |
| 3 | -<<<<<<< HEAD | |
| 4 | - <div class="btn-effect row mx-0 bg-light"> | |
| 5 | - <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div> | |
| 6 | -======= | |
| 7 | 3 | <div class="btn-effect row mx-0 bg-light" (click)="reducirPantalla()"> |
| 8 | - <div class="col-auto align-self-center text-primary">REDUCIR PANTALLA</div> | |
| 9 | ->>>>>>> 6877b1afabb0331da524a83d12700a7030e991eb | |
| 4 | + <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div> | |
| 10 | 5 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> |
| 11 | 6 | <img |
| 12 | 7 | draggable="false" |