sigonasr2/dev-osan.github.io
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'dev' into dynamicLogo-branch

Browse Source
This commit is contained in:
sigonasr2 2019-05-22 12:06:21 +09:00 committed by GitHub
commit 8897b5010b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
additionalScripts.js
View File

@ -1,3 +1,4 @@
var vals = [ var vals = [
`<h1 class="devOsan""> `<h1 class="devOsan"">
<span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan <span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
@ -20,3 +21,8 @@ function generateLogo(numb) {
document.getElementById("devOsanLogo-dynamic").innerHTML=vals[numb]; document.getElementById("devOsanLogo-dynamic").innerHTML=vals[numb];
document.getElementById("devOsanMiniLogo-dynamic").innerHTML=vals2[numb]; document.getElementById("devOsanMiniLogo-dynamic").innerHTML=vals2[numb];
} }
$(function(){
var navMain = $(".navbar-collapse");
navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');});
});

31
index.html
View File

@ -150,9 +150,30 @@
<div class="col-sm-6" id="projects"> <div class="col-sm-6" id="projects">
<h3><i class="fas fa-code-branch"></i><br />Projects</h3> <h3><i class="fas fa-code-branch"></i><br />Projects</h3>
<br /> <br />
<p>Bus GPS</p> <div id="projectCarousel" class="carousel slide" data-ride="carousel">
<p>{dev}Osan Website</p> <div class="carousel-inner">
<p>Pending Game Engine</p> <div class="carousel-item active" data-interval="10000">
<h3>Bus GPS</h3>
<p>Kevin Falting</p>
</div>
<div class="carousel-item" data-interval="10000">
<h3>{dev}Osan Website</h3>
<p>{dev}Osan Club</p>
</div>
<div class="carousel-item" data-interval="10000">
<h3>Pending Game Engine</h3>
<p>Joshua Sigona</p>
</div>
</div>
<a class="carousel-control-prev" href="#projectCarousel" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#projectCarousel" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -205,7 +226,7 @@
src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js"
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous" crossorigin="anonymous"
></script> ></script
<script src="additionalScripts.js"></script> <script src="additionalScripts.js"></script>
</body> </body>
</html> </html>