Skip to content

Commit

Permalink
#54 css 링크 문제 해결/ html과 재분리
Browse files Browse the repository at this point in the history
  • Loading branch information
alreadynyeong committed Jan 19, 2022
1 parent 81851b6 commit 37f3790
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 237 deletions.
115 changes: 32 additions & 83 deletions public/html/test.html
Original file line number Diff line number Diff line change
@@ -1,90 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<style>
@charset "utf-8";
/*폰트*/
@import url('https://fonts.googleapis.com/css2?family=Pattaya&display=swap');
*{margin: 0; padding: 0;}

@font-face {
font-family: 'GmarketSansMedium';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/GmarketSansMedium.woff') format('woff');
font-weight: normal;
font-style: normal;
}

*:not(i) {
font-family: GmarketSansMedium;
}

a {
text-decoration: none;
color: white;
}

p {
color: white;
}

body {
margin: auto;
background-color: #242424;
text-align: center;
}

main {
margin-top: 150px;
}

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

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

.move {
margin: auto;
width: 320px;
color: white;
}

.move div{
color: white;
float: left;
margin-right: 5px;
margin-left: 5px;
padding-top: 10px;
width: 150px;
height: 30px;
border-radius: 10px;
}

.prev {
background-color: #BDBDBD;
}

.next {
background-color: #0BF3BC;
}
</style>
<head>
<meta charset="UTF-8">
<title>Hi MBTI</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <link rel="stylesheet" href="/public/css/test.css" /> -->
<link rel="stylesheet" type="text/css" href="../css/test.css" >
</head>

<body>
Expand All @@ -95,9 +16,9 @@
<div><a>1/12</a></div><br>

<div class="qna">
<p>Q1. 술집에서 멍하니 있는 당신의 머리속은?</p><br><br>
<div class="btn_1">무한한 상상의 나래 속으로</div><br><br>
<div class="btn_1">집.. 어떻게 가지?</div><br>
<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>
<br><br>
<div class="move">
Expand All @@ -107,4 +28,32 @@
</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> -->


</html>
94 changes: 1 addition & 93 deletions public/html/test_result.html
Original file line number Diff line number Diff line change
@@ -1,101 +1,9 @@
<!DOCTYPE html>
<html lang="en">
<head>
<style>
@charset "utf-8";
/*폰트*/
@import url('https://fonts.googleapis.com/css2?family=Pattaya&display=swap');
*{margin: 0; padding: 0;}

@font-face {
font-family: 'GmarketSansMedium';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/GmarketSansMedium.woff') format('woff');
font-weight: normal;
font-style: normal;
}

*:not(i) {
font-family: GmarketSansMedium;
}

a {
text-decoration: none;
color: white;
}

.result {
width: 100%;
padding-top: 130px;
}

.result a {
text-decoration: none;
font-size: 20px;
color: white;
}

.result img {
margin-top: 20px;
margin-bottom: 10px;
width: 100px;
}

body {
margin: auto;
background-color: #242424;
text-align: center;
}

main {
margin-top: 150px;
}
.exp {
margin-top: 50px;
margin-bottom: 30px;
}
.exp li{
margin-top: 10px;
}
.match {
margin: auto;
width: 424px;
color: white;
}
.match div {
float: left;
margin-right: 5px;
margin-left: 5px;
width: 200px;
height: 70px;
padding-top: 20px;
border: 1px solid #0BF3BC;
border-radius: 10px;
}

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

.share {
margin-top: 30px;
margin-bottom: 30px;
font-size: 15px;
color: white;
}
.share img {
width: 50px;
}
</style>
<meta charset="UTF-8">
<title>Hi MBTI Result</title>
<link rel="stylesheet" href="public/css/test_result.css">
<link rel="stylesheet" type="text/css" href="../css/test_result.css" >
<meta name="viewport" content="width=device-width, initial-scale=1.0">
</head>
<body>
Expand Down
63 changes: 2 additions & 61 deletions public/html/test_start.html
Original file line number Diff line number Diff line change
@@ -1,70 +1,11 @@
<!DOCTYPE html>
<html lang="en">
<style>
@charset "utf-8";
/*폰트*/
@import url('https://fonts.googleapis.com/css2?family=Pattaya&display=swap');
*{margin: 0; padding: 0;}
p {
font-family: 'Pattaya', sans-serif;
color: white;
}

@font-face {
font-family: 'GmarketSansMedium';
src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/[email protected]/GmarketSansMedium.woff') format('woff');
font-weight: normal;
font-style: normal;
}

*:not(i) {
font-family: GmarketSansMedium;
}

a {
text-decoration: none;
color: white;
}

header {
width: 100%;
padding-top: 240px;
position: fixed;
}

header a {
text-decoration: none;
font-size: 20px;
color: white;
}

body {
margin: auto;
background-color: #242424;
text-align: center;
}

main {
padding-top: 540px;
}

.start {
color: white;
font-size: 17px;
padding-top: 11px;
margin: auto;
width: 185px;
height: 40px;
background: #0BF3BC;
border-radius: 50px;
}
</style>


<head>
<meta charset="UTF-8">
<title>Hi MBTI Start</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- <link rel="stylesheet" href="/public/css/test_start.css"/> -->
<link rel="stylesheet" type="text/css" href="../css/test_start.css" >
</head>

<body>
Expand Down

0 comments on commit 37f3790

Please sign in to comment.