From 801b5beeed028dfb11b42fb7685522e26555ae37 Mon Sep 17 00:00:00 2001
From: Jun-min2
Date: Sun, 22 Oct 2023 15:54:54 +0900
Subject: [PATCH 01/12] start
---
index.js | 0
1 file changed, 0 insertions(+), 0 deletions(-)
create mode 100644 index.js
diff --git a/index.js b/index.js
new file mode 100644
index 0000000..e69de29
From 6185a2d75f7a50f02a0129364367bbabbd929127 Mon Sep 17 00:00:00 2001
From: Jun-min2
Date: Mon, 23 Oct 2023 18:10:26 +0900
Subject: [PATCH 02/12] week2 Q1-1
---
index.js | 1 +
week1.css | 61 +++++++++++++++++++++++++++------
week1.html | 99 +++++++++++++++++++++++++++++++++++++++++++++---------
3 files changed, 134 insertions(+), 27 deletions(-)
diff --git a/index.js b/index.js
index e69de29..3e73a9e 100644
--- a/index.js
+++ b/index.js
@@ -0,0 +1 @@
+const =
\ No newline at end of file
diff --git a/week1.css b/week1.css
index 1f4bed7..f5bca8c 100644
--- a/week1.css
+++ b/week1.css
@@ -41,37 +41,76 @@ header.sticky{
position: sticky;
top:0px;
}
-div.one{
+section.one{
display:flex;
justify-content:center;
flex-wrap: wrap;
- margin: 0px 100px 0px 100px;
+ width: 70rem;
+ margin: 0 auto;
+}
+div.garden{
+ width: 12rem;
+ height: 12rem;
+ margin: 1rem;
+ position: relative;
+}
+.information:hover p{
+ opacity: 1;
+}
+.information:hover {
+ display: block;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ height: 12rem;
+ width: 12rem;
+ background-color: rgba(0, 0, 0, 0.5);
+}
+.information p{
+ opacity: 0;
+ color: white;
+ text-align: center;
+}
+
+.maintext{
+ font-size: 1.5rem;
}
img.oneday {
- width: 200px;
- height: 200px;
- padding:10px;
+ width:100%;
+ height: 100%;
+}
+.hovertext{
+ font-family:verdana, sans-serif;
+ position: absolute;
+ top: 50%;
+ left: 50%;
+ -webkit-transform: translate(-50%, -50%);
+ -ms-transform: translate(-50%, -50%);
+ transform: translate(-50%, -50%);
+ font-size: 1rem;
}
div.container{
display:flex;
justify-content:center;
- margin:0 200px 0 300px;
padding-top: 5px;
}
div.two{
display:flex;
flex-wrap:wrap;
- padding-right:100px;
+ justify-content: center;
+ width: 28rem;
}
div.two img{
- width:200px;
- height:200px;
+ width:13rem;
+ height:13rem;
padding:5px 0 5px 10px;
}
#bigpic{
- width :600px;
- height:410px;
+ width : 28rem;
+ height: 27rem;
padding:5px 0 5px 0;
}
article.container{
diff --git a/week1.html b/week1.html
index cc766fb..4b04f04 100644
--- a/week1.html
+++ b/week1.html
@@ -10,7 +10,7 @@
-
+
@@ -28,22 +28,89 @@ 쭌미 싱가폴 일기!
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
From a8467b87a5fe5b0f70256d960a569702776d7ee4 Mon Sep 17 00:00:00 2001
From: Jun-min2
Date: Mon, 23 Oct 2023 21:50:31 +0900
Subject: [PATCH 03/12] week2 Q1-2
---
index.js | 13 ++++++++++++-
week1.html | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/index.js b/index.js
index 3e73a9e..c2aa1a8 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,12 @@
-const =
\ No newline at end of file
+const button = document.getElementById('top');
+
+let opacity = 0;
+button.style.opacity = opacity;
+window.addEventListener('scroll', function() {
+
+ const scrollPosition = window.scrollY / (document.documentElement.scrollHeight - window.innerHeight);
+
+ opacity = scrollPosition;
+
+ button.style.opacity = opacity;
+});
\ No newline at end of file
diff --git a/week1.html b/week1.html
index 4b04f04..1c27653 100644
--- a/week1.html
+++ b/week1.html
@@ -135,6 +135,6 @@
-
+