Merge branch 'main' of https://github.com/HearMeWhisper/main_web into main
This commit is contained in:
Chris
commit
636813f7ec
@ -53,9 +53,8 @@
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<h1 class="display-4">Face Painting, Balloon Twisting & More!</h1>
|
||||
<main>
|
||||
<h1 class="display-4">Face Painting, Balloon Twisting & More!</h1>
|
||||
|
||||
|
||||
|
||||
@ -233,7 +232,10 @@
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</main>
|
||||
|
||||
|
||||
|
||||
|
||||
<footer>
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<head>
|
||||
<!-- Required meta tags -->
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">
|
||||
<link rel="shortcut icon" href="assets/images/logo.png" />
|
||||
|
||||
<link href="https://fonts.googleapis.com/css2?family=Sansita+Swashed:wght@500&display=swap" rel="stylesheet">
|
||||
@ -46,11 +46,18 @@
|
||||
</form>
|
||||
</div>
|
||||
</nav>
|
||||
<<<<<<< HEAD
|
||||
|
||||
<!-- <h1 class="display-3">Painted You</h1> -->
|
||||
<!-- <img class="mainLogo" src="assets/images/logo1.png" alt="" srcset=""> -->
|
||||
<p id="painted"><span id="p">P</span><span id="a">A</span><span id="i">I</span><span id="n">N</span><span id="t">T</span id="e"><span>E</span><span id="d">D</span>
|
||||
</p>
|
||||
=======
|
||||
<hr>
|
||||
<main>
|
||||
<h1 class="display-3">Painted You</h1>
|
||||
|
||||
>>>>>>> dca41e40bafe86685d867336d60b6157556c8e74
|
||||
<div id="carouselExampleCaptions" class="carousel slide" data-ride="carousel">
|
||||
<ol class="carousel-indicators">
|
||||
<li data-target="#carouselExampleCaptions" data-slide-to="0" class="active"></li>
|
||||
@ -188,7 +195,7 @@
|
||||
take-home gift.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</main>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
body{
|
||||
box-sizing: border-box;
|
||||
}
|
||||
nav{
|
||||
background-image: url(assets/images/bg3.jpg) ;
|
||||
background-color: pink;
|
||||
@ -53,7 +56,7 @@ footer{
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: center;
|
||||
width: 100vw;
|
||||
width: 100%;
|
||||
background-color: rgb(241, 147, 233);
|
||||
text-align: center;
|
||||
margin-top: 20px;
|
||||
@ -66,4 +69,11 @@ footer{
|
||||
|
||||
.formFooter{
|
||||
display:none !important;
|
||||
}
|
||||
|
||||
hr{
|
||||
background-color: #9966CC;
|
||||
height: 10px;
|
||||
margin: 0;
|
||||
padding: 0%;
|
||||
}
|
||||
@ -3,6 +3,7 @@
|
||||
<head>
|
||||
|
||||
<meta name="theme-color" content="#999999">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=yes">
|
||||
|
||||
<link rel="icon" type="image/ico" href="tictac.ico">
|
||||
<link rel="stylesheet" type="text/css" href="../menu.css">
|
||||
@ -16,7 +17,7 @@
|
||||
</div>
|
||||
<script src="../menu.js"></script>
|
||||
<br /><br /><br />
|
||||
<center>
|
||||
<main>
|
||||
</br>
|
||||
|
||||
</br>
|
||||
@ -38,8 +39,7 @@
|
||||
<div id="level">
|
||||
<h1> CHOOSE A LEVEL</h1>
|
||||
</div>
|
||||
</center>
|
||||
<center>
|
||||
|
||||
<pre>
|
||||
"Our home-amusements by the warm peat-fire
|
||||
At evening, when with pencil, and smooth slate
|
||||
@ -57,7 +57,7 @@ Even for the very service they had wrought,
|
||||
But husbanded through many a long campaign."
|
||||
- Wordsworth
|
||||
</pre>
|
||||
</center>
|
||||
</main>
|
||||
<script src="tictac.js">
|
||||
</script>
|
||||
</body>
|
||||
|
||||
@ -2,14 +2,28 @@ body {
|
||||
background: -webkit-linear-gradient(45deg, hsla(0, 0%, 97%, 1) 0%, hsla(0, 0%, 97%, 0) 70%), -webkit-linear-gradient(315deg, hsla(0, 0%, 38%, 1) 10%, hsla(0, 0%, 38%, 0) 80%), -webkit-linear-gradient(225deg, hsla(0, 0%, 63%, 1) 10%, hsla(0, 0%, 63%, 0) 80%), -webkit-linear-gradient(135deg, hsla(0, 0%, 29%, 1) 100%, hsla(0, 0%, 29%, 0) 70%);
|
||||
background: linear-gradient(45deg, hsla(0, 0%, 97%, 1) 0%, hsla(0, 0%, 97%, 0) 70%), linear-gradient(135deg, hsla(0, 0%, 38%, 1) 10%, hsla(0, 0%, 38%, 0) 80%), linear-gradient(225deg, hsla(0, 0%, 63%, 1) 10%, hsla(0, 0%, 63%, 0) 80%), linear-gradient(315deg, hsla(0, 0%, 29%, 1) 100%, hsla(0, 0%, 29%, 0) 70%);
|
||||
}
|
||||
|
||||
td{
|
||||
border: 3px solid black;
|
||||
height: 100px;
|
||||
width: 100px;
|
||||
}
|
||||
#game {
|
||||
background-color: #E60000;
|
||||
background-color:#ce4949;
|
||||
text-align: center;
|
||||
box-shadow: 5px 5px 5px #888888;
|
||||
-webkit-animation: rubberBand 1s;
|
||||
/* Chrome, Safari, Opera */
|
||||
animation: rubberBand 1s;
|
||||
height: 300px;
|
||||
width: 300px;
|
||||
border-collapse: collapse;
|
||||
/* color:#1A1A1A; */
|
||||
|
||||
}
|
||||
|
||||
|
||||
tr{
|
||||
|
||||
}
|
||||
#game:hover{
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#button {
|
||||
@ -30,5 +44,22 @@ body {
|
||||
}
|
||||
|
||||
.t2 {
|
||||
color: red;
|
||||
}
|
||||
|
||||
}
|
||||
.cells{
|
||||
text-align: center;
|
||||
}
|
||||
#tic{
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
main{
|
||||
margin: auto;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
flex-direction: column;
|
||||
}
|
||||
pre{
|
||||
text-align: center;
|
||||
}
|
||||
/* style=" color:#1A1A1A" border="3" cellspacing="10" cellpadding="30" */
|
||||
@ -1,26 +1,3 @@
|
||||
|
||||
var isLame = {
|
||||
|
||||
iOS: function() {
|
||||
return navigator.userAgent.match(/iPhone|iPad|iPod/i);
|
||||
},
|
||||
Opera: function() {
|
||||
return navigator.userAgent.match(/Opera/i);
|
||||
},
|
||||
Windows: function() {
|
||||
return navigator.userAgent.match(/IEMobile/i) || navigator.userAgent.match(/WPDesktop/i) || navigator.appName.match(/Microsoft|Explorer|IE/i);
|
||||
},
|
||||
any: function() {
|
||||
return (isLame.iOS() || isLame.Opera() || isLame.Windows());
|
||||
}
|
||||
};
|
||||
if ( isLame.any() ) {
|
||||
document.getElementById("ham").removeAttribute("tabindex");document.getElementById("ham").removeAttribute("onblur");document.getElementById("ham").removeAttribute("onfocusout");
|
||||
//alert(navigator.userAgent)
|
||||
}
|
||||
|
||||
|
||||
|
||||
var board = []
|
||||
var i = Number(i)
|
||||
var j, a, error,xmove, omove, xwin, owin, draw, start;
|
||||
@ -34,13 +11,13 @@ columns = 3
|
||||
function drawboard(ary){
|
||||
document.getElementById("tic").innerHTML = ""
|
||||
str = ""
|
||||
str += '<table id="game" align="center" style="border-collapse: collapse;width:95px; height:95px; color:#1A1A1A" border="3" cellspacing="10" cellpadding="30">'
|
||||
str += '<table id="game">'
|
||||
|
||||
for(p = 1, q=1; p < rows; p++){
|
||||
|
||||
str += '<tr>'
|
||||
for (j = 0; j < columns; q++,j++){
|
||||
str += '<td style = color:#FFFFFF id="cell'+q+'">' +ary[q]+'</td>';
|
||||
str += '<td style = color:#FFFFFF class="cells" id="cell'+q+'">' +ary[q]+'</td>';
|
||||
|
||||
}
|
||||
str += '</tr>'
|
||||
@ -79,6 +56,8 @@ function cell9(){ if (board[9] == 9 && endgame == false){ board[9] = turn; docum
|
||||
|
||||
function changeTurn(){
|
||||
if(turn == 'X'){
|
||||
// document.getElementsByTagName("td").style.color = "#19FF19";
|
||||
|
||||
turn = 'O';
|
||||
} else {
|
||||
turn = 'X';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user