so679ir/git-repoZSI
1
0
Fork 13
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

merge into: so679ir:master
Branches Tags
so679ir:master
dg125gr:master
dg125gr:extension
...
pull from: dg125gr:master
Branches Tags
dg125gr:master
dg125gr:extension
so679ir:master

5 Commits
master ... master

Author SHA1 Message Date
David Gonda
80618d6c8d Resolved merge conflicts 2025-03-08 22:23:28 +01:00
Dávid Gonda
00819c1da7 Update index.html 
Changed button text from "View details" to "More".
 2025-03-08 21:21:56 +00:00
David Gonda
85920e463c Merge branch 'extension' 
Merge extension branch into master
 2025-03-08 22:15:46 +01:00
David Gonda
da99f9b880 extended page 2025-03-08 22:14:44 +01:00
David Gonda
4c3d50cfa7 added footer 2025-03-08 22:07:56 +01:00
1 changed files with 22 additions and 3 deletions
Show Stats Expand all files Collapse all files

25
index.html
View File

@ -30,20 +30,39 @@
<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>
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></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>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
</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>
<p><a class="btn btn-primary" href="#" role="button">View details &raquo;</a></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>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
</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">View details &raquo;</a></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>
>>>>>>> 00819c1da7b6eab5bbfca491c027cf742b953d75
</div>
</div>
</div>
</body>
<footer>
<div class="container">
<hr />
KPI TUKE
</div>
</footer>
</html>