Skip to content

Commit

Permalink
#54 버튼 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
alreadynyeong committed Jan 21, 2022
1 parent 777d687 commit fb22bfd
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 40 deletions.
9 changes: 5 additions & 4 deletions public/css/test.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,22 @@ main {

.qna {
margin: auto;
padding: 20px;
padding: 30px;
background-color: #202020;
border-radius: 10px;
width: 350px;
}

.qna div {
.inner button {
margin: auto;
width: 250px;
height: 90px;
height: 150px;
font-size: 15px;
color: white;
background-color: #202020;
border: 1px solid #8BFEE2;
box-shadow: 0px 0px 10px 0.5px rgba(11, 243, 188, 0.5);
border-radius: 20px;
padding-top: 60px;
}

.move {
Expand Down
8 changes: 4 additions & 4 deletions public/css/test_result.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@ main {
border-radius: 10px;
}

.return {
.inner button{
color: white;
font-size: 17px;
padding-top: 15px;
margin: auto;
width: 260px;
height: 35px;
background: #0BF3BC;
height: 50px;
background-color: #0BF3BC;
border: #0BF3BC;
border-radius: 10px;
}

Expand Down
8 changes: 4 additions & 4 deletions public/css/test_start.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ main {
padding-top: 540px;
}

.start {
.inner button{
color: white;
font-size: 17px;
padding-top: 11px;
margin: auto;
width: 185px;
height: 40px;
background: #0BF3BC;
height: 50px;
background-color: #0BF3BC;
border: #0BF3BC;
border-radius: 50px;
}
39 changes: 13 additions & 26 deletions public/html/test.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<title>Hi MBTI</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="../css/test.css" >

<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>

</head>

<body>
Expand All @@ -17,43 +20,27 @@

<div class="qna">
<p id="q">Q1. 술집에서 멍하니 있는 당신의 머리속은?</p><br><br>
<div class="btn_1" id="btn_1"><a href="#">무한한 상상의 나래 속으로</a></div><br><br>
<div class="btn_2">집.. 어떻게 가지?</div><br>

<div class="inner"><button id="brn_1" class="btn"> 무한한 상상의 나래 속으로</button></div>
<br>
<div class="inner"><button id="btn_2" class="btn"> 집.. 어떻게 가지?</button></div>
</div>
<br><br>
<div class="move">
<div class="prev">이전</div>
<div class="next">다음</div>
</div>
</div>

</main>

</body>
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>

<script>
$(".btn_1").click(function(){
$.getJSON("./question.json", function(data){
var txt ='';
$.each(data, function(key, value){
txt += "q : "+ value.question;
txt += "a1 : "+ value.answer1;
txt += "a2 : "+ value.answer2;
});
console.log("hello1");
console.log(txt);
});
console.log("hello2");
console.log(txt);
return false;
});
</script>

<!-- <script>

$('.btn_1').click(function(){
console.log("hello");
})
</script> -->
$(".btn").click(function() {
location.href = "test.html";
});

</script>

</html>
9 changes: 8 additions & 1 deletion public/html/test_result.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
<title>Hi MBTI Result</title>
<link rel="stylesheet" type="text/css" href="../css/test_result.css" >
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>

</head>
<body>
<div class="result">
Expand Down Expand Up @@ -34,9 +36,14 @@
</div>

<main>
<div class="return"><a href="test_start.html">처음으로</a></div>
<div class="inner"><button id="restart" class="btn"> 처음으로</button></div>
<div class="share"> <img src="../img/bt_kakao.png"><br>공유하기</div>
</main>

</body>
<script>
$("#restart").click(function() {
location.href = "test_start.html";
});
</script>
</html>
11 changes: 10 additions & 1 deletion public/html/test_start.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,24 @@
<title>Hi MBTI Start</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="../css/test_start.css" >
<script src="https://code.jquery.com/jquery-3.6.0.min.js" integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>

</head>

<body>
<header>
<a>당신에게 어울리는 <span style="color:#0BF3BC "></span>테스트</a>
</header>
<main>
<div class="start"><a href = "test.html">테스트 시작</a></div>

<div class="inner"><button id="start" class="btn">테스트 시작</button></div>
</main>

</body>

<script>
$("#start").click(function() {
location.href = "test.html";
});
</script>
</html>

0 comments on commit fb22bfd

Please sign in to comment.