Martin Macola / autoservicio

Download as
Browse Code ยป

Commit 35a1764f9932ab7d0e1cccc498c82476d25d1a52

Authored by Marcelo Puebla
2 parents 39f1073b1b ca5ef655e6
Exists in master

Merge branch 'master' of git.focasoftware.com:angular/autoservicio 

# Conflicts:
#	src/styles.scss
Showing 3 changed files   Show diff stats
src/app/components/inicio/inicio.component.html
Diff comments   View file @ 35a1764
... ... @@ -80,16 +80,13 @@
80 80 <p class="h3 card-title">Ordenar</p>
81 81 </div>
82 82 <div class="col-7 p-0">
83   - <div class="bg-white"><img src="../../../assets/icons/primario.ordenar.png" alt="" class="icon-dim">
84   - </div>
  83 + <img src="../../../assets/icons/primario.ordenar.png" alt="" class="icon-dim">
85 84 </div>
86 85 </div>
87   -
88 86 <p class="h5 card-text text-muted font-weight-light">Arme su pedido y solo pase a retirar.</p>
89 87 </div>
90 88 <img class="card-img-bottom d-block w-50 mx-auto mb-4 rounded" src="../../assets/img/descarga.jpg">
91 89 </div>
92   -
93 90 </div>
94 91  
95 92 <div class="col-md-7 d-flex align-items-end flex-column">
src/assets/scss/bootstrap-override.scss
Diff comments   View file @ 35a1764
... ... @@ -16,10 +16,5 @@ $theme-colors: (
16 16 border-color: #2872ae !important;
17 17 }
18 18  
19   -.icon-dim{
20   - height: 40px !important;
21   - width: auto !important;
22   - background-color: white !important;
23   -}
24 19  
25 20 @import "../../../node_modules/bootstrap/scss/bootstrap.scss";
... ... @@ -67,3 +67,18 @@ body {
67 67 border-radius: 10px;
68 68 }
69 69 }
  70 +
  71 +.icon-dim {
  72 + height: 40px !important;
  73 + width: auto !important;
  74 + background-color: white !important;
  75 +}
  76 +
  77 +.carousel-indicators li{
  78 + width: 10px !important;
  79 + height: 10px !important;
  80 + border-radius: 15px !important;
  81 + border-top: black !important;
  82 + border-bottom: black !important;
  83 +}
  84 +