kristjank/planica2018
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Premaknil slike v svojo mapo, dodal informacije

Browse Source
This commit is contained in:
d3m1g0d
2018-10-05 14:35:12 +02:00
parent ef6f3e13ef
commit 1090e7d209
7 changed files with 74 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
gallery.html
View File

@@ -27,6 +27,7 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link" href="index.html">Domov</a></li> <li class="nav-item"><a class="nav-link" href="index.html">Domov</a></li>
<li class="nav-item active"><a class="nav-link" href="gallery.html">Galerija</a></li> <li class="nav-item active"><a class="nav-link" href="gallery.html">Galerija</a></li>
<li class="nav-item"><a class="nav-link" href="info.html">Informacije</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>
@@ -34,22 +35,10 @@
<div class="text-right container"> <div class="text-right container">
<h1 class="text-center text-white">Galerija</h1> <h1 class="text-center text-white">Galerija</h1>
</div> </div>
</div>
<div>
</div> </div>
<footer class="text-muted text-center">Copyright 2018 Kristjan Komloši in Jakob Kosec</footer> <footer class="text-muted text-center">Copyright 2018 Kristjan Komloši in Jakob Kosec</footer>
<div>
<h4>1. Dan 15.10.</h2>
</div>
<div>
<h4>2. Dan 16.10.</h2>
</div>
<div>
<h4>3. Dan 17.10.</h2>
</div>
<div>
<h4>4. Dan 18.10.</h2>
</div>
<div>
<h4>5. Dan 19.10.</h2>
</div>
</body> </body>
</html> </html>

0
gallery.jpg → imgs/gallery.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 133 KiB

After

Width:  |  Height:  |  Size: 133 KiB

0
planica.jpg → imgs/planica.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 479 KiB

After

Width:  |  Height:  |  Size: 479 KiB

1
index.html
View File

@@ -26,6 +26,7 @@
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
<li class="nav-item active"><a class="nav-link" href="index.html">Domov</a></li> <li class="nav-item active"><a class="nav-link" href="index.html">Domov</a></li>
<li class="nav-item"><a class="nav-link" href="gallery.html">Galerija</a></li> <li class="nav-item"><a class="nav-link" href="gallery.html">Galerija</a></li>
<li class="nav-item"><a class="nav-link" href="info.html">Informacije</a></li>
</ul> </ul>
</div> </div>
</nav> </nav>

67
info.html Normal file
View File

@@ -0,0 +1,67 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css">
<!--Bootstrap JS-->
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
<!--Custom CSS-->
<link rel="stylesheet" href="main.css">
<!--Custom JS-->
<script src="countdown.js" type="text/javascript"></script>
<title>Planica 2018 - Informacije</title>
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<div>
<a href="index.html" class="navbar-brand">Projektni teden Planica 2018</a>
</div>
<div class="collapse navbar-collapse">
<ul class="navbar-nav mr-auto">
<li class="nav-item"><a class="nav-link" href="index.html">Domov</a></li>
<li class="nav-item"><a class="nav-link" href="gallery.html">Galerija</a></li>
<li class="nav-item active"><a class="nav-link" href="info.html">Informacije</a></li>
</ul>
</div>
</nav>
<div class="container">
<table class="table text-center">
<tr>
<th scope="colgroup" class="text-center h3" colspan="6">Urnik</th>
</tr>
<tr>
<th scope="row">Ura</th>
<th scope="row">Ponedeljek</th>
<th scope="row">Torek</th>
<th scope="row">Sreda</th>
<th scope="row">Četrtek</th>
<th scope="row">Petek</th>
</tr>
<tr>
<td>7:00</td>
<td rowspan="3"></td>
<td rowspan="2">Budnica, Jutranja telovadba in zajtrk</td>
<td rowspan="2">Budnica, Jutranja telovadba in zajtrk</td>
<td rowspan="2">Budnica, Jutranja telovadba in zajtrk</td>
<td rowspan="2">Budnica, Jutranja telovadba in zajtrk</td>
</tr>
<tr>
<td>9:00</td>
</tr>
<tr>
<td>10:00</td>
</tr>
<tr>
<td>11:00</td>
</tr>
</table>
</div>
</body>
</html>

22
informacije.html
View File

@@ -1,22 +0,0 @@
<!doctype html>
<html lang="en">
<head>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css" integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
<title>Informacije</title>
</head>
<body>
<h1>Informacije</h1>
<!-- Optional JavaScript -->
<!-- jQuery first, then Popper.js, then Bootstrap JS -->
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
</body>
</html>

4
main.css
View File

@@ -2,12 +2,12 @@
font-size: 24px; font-size: 24px;
} }
.planica-jumbo { .planica-jumbo {
background-image: url("planica.jpg"); background-image: url("imgs/planica.jpg");
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
} }
.gallery-jumbo { .gallery-jumbo {
background-image: url("gallery.jpg"); background-image: url("imgs/gallery.jpg");
background-position: center center; background-position: center center;
background-size: cover; background-size: cover;
} }