da230us/git-branch
1
0
Fork 0
forked from so679ir/git-repoZSI
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: da230us:ac571f6450dd7174a0ab8413165259566000ca51
Branches Tags
da230us:master
da230us:extension
so679ir:master
...
compare: da230us:c2eff666db869a4a039df6491588518dfd276173
Branches Tags
da230us:master
da230us:extension
so679ir:master

4 Commits
ac571f6450 ... c2eff666db

Author SHA1 Message Date
Dávid Andrišov
c2eff666db Merge remote-tracking branch 'origin/master' 2024-02-27 21:16:21 +01:00
Dávid Andrišov
01044da67c Merge branch 'extension' 2024-02-27 21:10:27 +01:00
Dávid Andrišov
a4b1e4d4c0 extended page 2024-02-27 21:08:05 +01:00
Dávid Andrišov
a46d47c9f4 added footer 2024-02-27 20:54:56 +01:00
1 changed files with 57 additions and 1 deletions
Show Stats Expand all files Collapse all files

60
index.html
View File

@ -1,3 +1,4 @@
<!doctype html>
<html class="no-js" lang="">
<head>
@ -26,24 +27,79 @@
</div>
<div class="container">
<!-- Original row -->
<div class="row">
<div class="col-md-4">
<h2>Heading 1</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
<div class="col-md-4">
<h2>Heading 2</h2>
<p>Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
<div class="col-md-4">
<h2>Heading 3</h2>
<p>Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus.</p>
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
</div>
<<<<<<< HEAD
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
</div>
<!-- New row #1 -->
<div class="row">
<div class="col-md-4">
<h2>Nový Nadpis 4</h2>
<p>Popis pre novú sekciu 4.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Nový Nadpis 5</h2>
<p>Popis pre novú sekciu 5.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Nový Nadpis 6</h2>
<p>Popis pre novú sekciu 6.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
</div>
<!-- New row #2 -->
<div class="row">
<div class="col-md-4">
<h2>Nový Nadpis 7</h2>
<p>Popis pre novú sekciu 7.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Nový Nadpis 8</h2>
<p>Popis pre novú sekciu 8.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
</div>
<div class="col-md-4">
<h2>Nový Nadpis 9</h2>
<p>Popis pre novú sekciu 9.</p>
<p><a class="btn btn-success" href="#" role="button">View details &raquo;</a></p>
=======
<p><a class="btn btn-primary" href="#" role="button">More &raquo;</a></p>
>>>>>>> origin/master
</div>
</div>
</div>
<footer>
<div class="container">
<hr /> KPI TUKE
</div>
</footer>
</body>
</html>