Skip to content

Linea 6 ela #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElaRoldan wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Linea 6 ela #4

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4ab0ab8
Agregada la info de la linea 1
invalid-email-address Oct 19, 2018
86983d8
Agregada informacion de la linea 3
checor Oct 19, 2018
cc3cfd1
Agrega informacion de la linea 4
ElaRoldan Oct 19, 2018
c392483
Merge pull request #1 from checor/linea-3
checor Oct 19, 2018
0d39786
Merge branch 'linea-1'
checor Oct 19, 2018
2f26ee6
Merge branch 'linea-4'
ElaRoldan Oct 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ <h1 class="display-4">Bienvenido al servicio de transporte colectivo metro</h1>
<div class="card" style="width: 18rem;">
<img class="card-img-top" src="..." alt="Card image cap">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<h5 class="card-title">Linea-1</h5>
<p class="card-text">La línea 1 va de la estacion observatorio a Pantitlan</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
</div>
</div>
Expand All @@ -85,19 +85,19 @@ <h5 class="card-title">Card title</h5>
<div class="card" style="width: 18rem;">
<img class="card-img-top" src="..." alt="Card image cap">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
<h5 class="card-title">Linea 3</h5>
<p class="card-text">La Línea 3 va desde Indios Verdes hasta Universidad</p>
<a href="#" class="btn btn-primary">Ver estaciones</a>
</div>
</div>
</div>
<div class="col-sm-12 col-md-3 col-xl-3">
<div class="card" style="width: 18rem;">
<img class="card-img-top" src="..." alt="Card image cap">
<div class="card-body">
<h5 class="card-title">Card title</h5>
<p class="card-text">Some quick example text to build on the card title and make up the bulk of the card's content.</p>
<a href="#" class="btn btn-primary">Go somewhere</a>
<h5 class="card-title">Línea 4</h5>
<p class="card-text">Esta línea va de Santa Anita a Martin Carrera.</p>
<a href="#" class="btn btn-primary">Ver mapa</a>
</div>
</div>
</div>
Expand Down Expand Up @@ -153,7 +153,7 @@ <h5 class="card-title">Card title</h5>
</div>


<button type="button" class="btn btn-lg btn-danger" data-toggle="popover" title="Betech" data-content="Hola mundo!">Click to toggle popover</button>
<button type="button" class="btn btn-lg btn-danger" data-toggle="popover" title="Betech" data-content="Ver estaciones">Click to toggle popover</button>

<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js" integrity="sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q" crossorigin="anonymous"></script>
Expand Down