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
| 1 | $primary: #aa006b; | 1 | $primary: #aa006b; |
| 2 | 2 | ||
| 3 | .box-categorias { | 3 | .box-categorias { |
| 4 | height: calc(100% - 100px) !important; | 4 | height: calc(100% - 100px) !important; |
| 5 | } | 5 | } |
| 6 | 6 | ||
| 7 | .active { | 7 | .active { |
| 8 | background-color: white; | 8 | background-color: white; |
| 9 | border-bottom: 3px solid $primary !important; | 9 | border-bottom: 3px solid $primary !important; |
| 10 | border-top: 3px solid $primary !important; | 10 | border-top: 3px solid $primary !important; |
| 11 | border-left: 3px solid $primary !important; | 11 | border-left: 3px solid $primary !important; |
| 12 | border-right: 3px solid $primary !important; | 12 | border-right: 3px solid $primary !important; |
| 13 | .border { | ||
| 14 | opacity: 40%; | ||
| 15 | } | ||
| 16 | } | 13 | } |
| 17 | 14 | ||
| 18 | .border-bottom-effect { | 15 | .border-bottom-effect { |
| 19 | border: none; | 16 | border: none; |
| 20 | position: relative; | 17 | position: relative; |
| 21 | &:hover { | 18 | &:hover { |
| 22 | border: none; | 19 | border: none; |
| 23 | } | 20 | } |
| 24 | &::after { | 21 | &::after { |
| 25 | content: ""; | 22 | content: ""; |
| 26 | position: absolute; | 23 | position: absolute; |
| 27 | width: 0px; | 24 | width: 0px; |
| 28 | height: 3px; | 25 | height: 3px; |
| 29 | left: 50%; | 26 | left: 50%; |
| 30 | bottom: 0; | 27 | bottom: 0; |
| 31 | background-color: $primary; | 28 | background-color: $primary; |
| 32 | transition: all ease-in-out 0.2s; | 29 | transition: all ease-in-out 0.2s; |
| 33 | } | 30 | } |
| 34 | &:hover::after { | 31 | &:hover::after { |
| 35 | width: 100%; | 32 | width: 100%; |
| 36 | left: 0; | 33 | left: 0; |
| 37 | } | 34 | } |
| 38 | } | 35 | } |
| 39 | 36 | ||
| 40 | .card { | 37 | .card { |
| 41 | border: none; | 38 | border: none; |
| 42 | } | 39 | } |
| 43 | 40 | ||
| 44 | .line-height-sm { | 41 | .line-height-sm { |
| 45 | line-height: 1.2; | 42 | line-height: 1.2; |
| 46 | } | 43 | } |
| 47 | 44 | ||
| 48 | #content.media-pantalla,#boxCarrito.media-pantalla { | 45 | #content.media-pantalla,#boxCarrito.media-pantalla { |
| 49 | max-height: 60% !important; | 46 | max-height: 60% !important; |
| 50 | } | 47 | } |
| 51 | 48 | ||
| 52 | .cat-content.media-pantalla { | 49 | .cat-content.media-pantalla { |
| 53 | margin: 0.5rem 0.7rem !important; | 50 | margin: 0.5rem 0.7rem !important; |
| 54 | height: 76% !important; | 51 | height: 76% !important; |
| 55 | } | 52 | } |
| 56 | 53 | ||
| 57 | .cat-box.media-pantalla{ | 54 | .cat-box.media-pantalla{ |
| 58 | height: calc(100% - 85px) !important; | 55 | height: calc(100% - 85px) !important; |
| 59 | } | 56 | } |
| 60 | 57 | ||
| 61 | .cat-btn.media-pantalla { | 58 | .cat-btn.media-pantalla { |
| 62 | height: 7% !important; | 59 | height: 7% !important; |
| 63 | } | 60 | } |
| 64 | 61 | ||
| 65 | .img-categoria.media-pantalla{ | 62 | .img-categoria.media-pantalla{ |
| 66 | min-height: 40px !important; | 63 | min-height: 40px !important; |
| 67 | } | 64 | } |
src/app/shared/footer/footer.component.html
| 1 | <div class="row w-90 mx-auto h-100 justify-content-between bg-white"> | 1 | <div class="row w-90 mx-auto h-100 justify-content-between bg-white"> |
| 2 | <div class="col-auto align-self-center px-0 bg-white"> | 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 | <div class="btn-effect row mx-0 bg-light" (click)="reducirPantalla()"> | 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> | 4 | <div class="col-auto align-self-center text-primary">ADAPTAR PANTALLA</div> |
| 9 | >>>>>>> 6877b1afabb0331da524a83d12700a7030e991eb | ||
| 10 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> | 5 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> |
| 11 | <img | 6 | <img |
| 12 | draggable="false" | 7 | draggable="false" |
| 13 | ondragstart="return false;" | 8 | ondragstart="return false;" |
| 14 | (contextmenu)="false" | 9 | (contextmenu)="false" |
| 15 | class="p-2 icon-60" | 10 | class="p-2 icon-60" |
| 16 | src="assets/img/iconos-accesibilidad.svg"> | 11 | src="assets/img/iconos-accesibilidad.svg"> |
| 17 | </div> | 12 | </div> |
| 18 | </div> | 13 | </div> |
| 19 | </div> | 14 | </div> |
| 20 | <div | 15 | <div |
| 21 | class="btn-effect col-auto align-self-center px-0 bg-white" | 16 | class="btn-effect col-auto align-self-center px-0 bg-white" |
| 22 | (click)="goBack()"> | 17 | (click)="goBack()"> |
| 23 | <div class="row mx-0 bg-light"> | 18 | <div class="row mx-0 bg-light"> |
| 24 | <div class="col-auto align-self-center text-primary">VOLVER</div> | 19 | <div class="col-auto align-self-center text-primary">VOLVER</div> |
| 25 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> | 20 | <div class="col-auto p-0 bg-primary d-none d-sm-block"> |
| 26 | <img | 21 | <img |
| 27 | draggable="false" | 22 | draggable="false" |
| 28 | ondragstart="return false;" | 23 | ondragstart="return false;" |
| 29 | (contextmenu)="false" | 24 | (contextmenu)="false" |
| 30 | class="p-2 icon-40" | 25 | class="p-2 icon-40" |
| 31 | src="assets/img/icono-volver.svg"> | 26 | src="assets/img/icono-volver.svg"> |
| 32 | </div> | 27 | </div> |
| 33 | </div> | 28 | </div> |
| 34 | </div> | 29 | </div> |
| 35 | </div> | 30 | </div> |
| 36 | 31 |