Skip to content

Commit

Permalink
0922 작업
Browse files Browse the repository at this point in the history 
- 용량 100mb 넘는 커밋파일 오류 check out 수정
- 영상 모두 유튜브 ifream으로 대체
- SNS 공유 이미지 제작
- 깃허브에서 유튜브 영상 연결안되는 부분 해결
- 깃허브에서 sns 공유 이미지 연결 안되는거 해결
- 드림캐쳐 커서 index.html 연결안되는 부분 수정
- 배경 이미지-> 색상 변경
- 1:1 영상 hd고화질로 재업로드 및 교체
  • Loading branch information
@fold6
fold6 committed Sep 21, 2024
1 parent d1597cb commit 98dd906
Show file tree
Hide file tree
Showing 22 changed files with 89,618 additions and 67,153 deletions.
8 changes: 0 additions & 8 deletions .gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,8 +0,0 @@

vid/2mb이하/swdc_yoohyeon.mp4
vid/2mb이하/swdc_sua.mp4
vid/2mb이하/swdc_siyeon.mp4
vid/2mb이하/swdc_jiu.mp4
vid/2mb이하/swdc_handong.mp4
vid/2mb이하/swdc_gahyun.mp4
vid/2mb이하/swdc_dami.mp4
5 changes: 4 additions & 1 deletion css/common.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,8 @@
html {
background: url('../img/bg.jpg?ver=2ewdw2')center center / cover;
height: 100vh;
width: 100vw;
background: radial-gradient(ellipse at bottom, rgb(20, 14, 81), rgb(10, 10, 26));
}


Expand Down Expand Up @@ -433,6 +435,7 @@ main {
margin: 0 auto;
text-align: center;
display: inline-block;

}


Expand Down Expand Up @@ -534,7 +537,7 @@ main {
border-radius: 50%;
overflow: hidden;
object-position: center center;
object-fit: h;
/* object-fit: h; */
/* background-color: #ededed; */
display: block;
box-sizing: border-box;
Expand Down
Binary file modified img/DC_Call/YT썸네일.psd
View file
Binary file not shown.
Binary file added img/DC_Call/dami_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/gahyun_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/handong_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/jiu_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/siyeon_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/sua_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added img/DC_Call/yoohyeon_call_short.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
156,652 changes: 89,585 additions & 67,067 deletions img/DC_swd.ai
View file

Large diffs are not rendered by default.

Binary file modified img/sns_thum.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
58 changes: 6 additions & 52 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>0921_Dream Room </title>
<title>Dream Room </title>

<!-- sns 공유 -->
<meta property="og:site_name" content="Dream Room">
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="img/sns_thum.png?ver=0921">
<meta property="og:image" content="img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
<link rel="icon" href="img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="css/font.css" rel="stylesheet" />
<link href="css/common.css" rel="stylesheet" />
<link href="css/common.css?ver=092222" rel="stylesheet" />
<link href="css/reset.css" rel="stylesheet" />

<!-- Font awesome icon -->
Expand All @@ -47,21 +47,8 @@
</head>
<!--
|￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣￣|
-240920:
- 영상 모두 유튜브 ifream으로 대체
- SNS 공유 이미지 제작 00
========================================
-240921 :
- 깃허브에서 유튜브 영상 연결안되는 부분 해결필요
- 깃허브에서 sns 공유 이미지 연결 안되는거 해결 필요
========================================
- 해야될 부분 : 설명버튼 설명 이미지 슬라이드
|＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿＿|
\ (•◡•) / Update MEMO
-->
Expand All @@ -70,23 +57,6 @@
.side_all {
box-shadow: 0px 0px 10px #8749F2;
}

/* 메인 비디오 비디오 터치 X + 컨트롤 숨기기 */
/* video {
pointer-events: none;
}

video::-webkit-media-controls {
display: none !important;
}

video::-moz-media-controls {
display: none !important;
}

video::-ms-media-controls {
display: none !important;
} */
</style>

<body>
Expand Down Expand Up @@ -235,7 +205,7 @@
</li>

<li class="cam_jiu">
<!-- <div class="video-container" style="position: relative; ">
<div class="video-container" style="position: relative; ">
<img src="https://img.youtube.com/vi/3XnnSwl-eYA/maxresdefault.jpg"
alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
Expand All @@ -247,23 +217,7 @@
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
</iframe>
</div> -->
<!-- 유튜브 안돼서 test -->
<div class="video-container" style="position: relative; ">
<!-- 유튜브 썸네일 이미지 -->
<img src="https://img.youtube.com/vi/qShkt8cvwGg/maxresdefault.jpg" alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
id="thumbnail">

<!-- 유튜브 영상 iframe -->
<iframe width="560" height="315" id="youtube-video"
src="https://www.youtube.com/embed/qShkt8cvwGg?autoplay=1&mute=1&playlist=qShkt8cvwGg&loop=1"
title="YouTube video player" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
</iframe>
</div>

</div>
<div class="mute_mic mem_mute_mic"><img src="img/mic_mute.png"></div>
<p class="mem_cam_name">🐰지유</p>
</li>
Expand Down Expand Up @@ -419,7 +373,7 @@
</script>

<!-- 공통 JS -->
<script src="js/index.js?ver=0920"></script>
<script src="js/index.js?ver=0922"></script>

</body>

Expand Down
3 changes: 1 addition & 2 deletions js/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,10 +468,9 @@ window.onload = function () {

$(document).ready(function () {

// 메인 화면 - 깃털 / 스타트 버튼 / 언어변경 호버시
$(".sideblock li, .fullpage, .controls button, .box_arrow_btn ,.drag_box_inner_btn li").hover(
function () {
$(this).css("cursor", "url('/img/DC_cursor/pointer.png'), pointer");
$(this).css("cursor", "url('./img/DC_cursor/pointer.png'), pointer");
}
);

Expand Down
1 change: 0 additions & 1 deletion js/sub_common.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,6 @@ $(document).ready(function () {

$(document).ready(function () {

// 메인 화면 - 깃털 / 스타트 버튼 / 언어변경 호버시
$(".sideblock li, .fullpage, .controls button, .box_arrow_btn ,.drag_box_inner_btn li").hover(
function () {
$(this).css("cursor", "url('../img/DC_cursor/pointer.png'), pointer");
Expand Down
8 changes: 4 additions & 4 deletions sub/with_dami_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css" rel="stylesheet" />
<link href="../css/sub_one_by_one.css" rel="stylesheet" />

Expand Down Expand Up @@ -92,13 +92,13 @@

<div class="video-container" style="position: relative; ">
<!-- 유튜브 썸네일 이미지 -->
<img src="https://img.youtube.com/vi/LpOcRDhLnNE/maxresdefault.jpg" alt="YouTube Thumbnail"
<img src="https://img.youtube.com/vi/C41PSewQy4g/maxresdefault.jpg" alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
id="thumbnail">

<!-- 유튜브 영상 iframe -->
<iframe width="560" height="315" id="youtube-video"
src="https://www.youtube.com/embed/LpOcRDhLnNE?autoplay=1&mute=1&playlist=LpOcRDhLnNE&loop=1"
src="https://www.youtube.com/embed/C41PSewQy4g?autoplay=1&mute=1&playlist=C41PSewQy4g&loop=1"
title="YouTube video player" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
Expand Down
4 changes: 2 additions & 2 deletions sub/with_gahyun_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css?ver=091515?ver=0922331212" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down
4 changes: 2 additions & 2 deletions sub/with_handong_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css?ver=091515?ver=0922331212" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down
8 changes: 4 additions & 4 deletions sub/with_jiu_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down Expand Up @@ -91,13 +91,13 @@

<div class="video-container" style="position: relative; ">
<!-- 유튜브 썸네일 이미지 -->
<img src="https://img.youtube.com/vi/qShkt8cvwGg/maxresdefault.jpg" alt="YouTube Thumbnail"
<img src="https://img.youtube.com/vi/NFEIcajd0w0/maxresdefault.jpg" alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
id="thumbnail">

<!-- 유튜브 영상 iframe -->
<iframe width="560" height="315" id="youtube-video"
src="https://www.youtube.com/embed/qShkt8cvwGg?autoplay=1&mute=1&playlist=qShkt8cvwGg&loop=1"
src="https://www.youtube.com/embed/NFEIcajd0w0?autoplay=1&mute=1&playlist=NFEIcajd0w0&loop=1"
title="YouTube video player" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
Expand Down
4 changes: 2 additions & 2 deletions sub/with_siyeon_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css?ver=091515?ver=0922331212" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down
8 changes: 4 additions & 4 deletions sub/with_sua_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css?ver=091515?ver=0922331212" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down Expand Up @@ -92,13 +92,13 @@
<div class="video-container" style="position: relative; ">

<!-- 유튜브 썸네일 이미지 -->
<img src="https://img.youtube.com/vi/oerNo9uYD74/maxresdefault.jpg" alt="YouTube Thumbnail"
<img src="https://img.youtube.com/vi/lo80EwiLWG0/maxresdefault.jpg" alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
id="thumbnail">

<!-- 유튜브 영상 iframe -->
<iframe width="560" height="315" id="youtube-video"
src="https://www.youtube.com/embed/oerNo9uYD74?autoplay=1&mute=1&playlist=oerNo9uYD74&loop=1"
src="https://www.youtube.com/embed/lo80EwiLWG0?autoplay=1&mute=1&playlist=lo80EwiLWG0&loop=1"
title="YouTube video player" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
Expand Down
8 changes: 4 additions & 4 deletions sub/with_yoohyeon_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
<meta property="og:title" content="Dream Room">
<meta property="og:description" content="드림캐쳐와 함께 작업하기 (Work With Dreamcatcher)">
<meta property="og:type" content="website">
<meta property="og:image" content="../img/sns_thum.png">
<meta property="og:image" content="../img/sns_thum.png?ver=0922">

<!-- 파비콘 -->
<link rel="shortcut icon" href="../img/favicon.ico" type="image/x-icon">
<link rel="icon" href="../img/favicon.ico" type="image/x-icon">

<!-- CSS -->
<link href="../css/font.css" rel="stylesheet" />
<link href="../css/common.css?ver=091515?ver=0922331212" rel="stylesheet" />
<link href="../css/common.css?ver=09222" rel="stylesheet" />
<link href="../css/reset.css?ver=0907" rel="stylesheet" />
<link href="../css/sub_one_by_one.css?ver=0902237" rel="stylesheet" />

Expand Down Expand Up @@ -92,13 +92,13 @@
<div class="video-container" style="position: relative; ">

<!-- 유튜브 썸네일 이미지 -->
<img src="https://img.youtube.com/vi/v4z2SRFDcXY/maxresdefault.jpg" alt="YouTube Thumbnail"
<img src="https://img.youtube.com/vi/g3EmBlq6XVU/maxresdefault.jpg" alt="YouTube Thumbnail"
style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;width: 100%;object-position: center center;object-fit: cover;height: 100%;"
id="thumbnail">

<!-- 유튜브 영상 iframe -->
<iframe width="560" height="315" id="youtube-video"
src="https://www.youtube.com/embed/v4z2SRFDcXY?autoplay=1&mute=1&playlist=v4z2SRFDcXY&loop=1"
src="https://www.youtube.com/embed/g3EmBlq6XVU?autoplay=1&mute=1&playlist=g3EmBlq6XVU&loop=1"
title="YouTube video player" frameborder="0"
allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
allowfullscreen>
Expand Down

0 comments on commit 98dd906

Please sign in to comment.