From 0c8c99c877a5a6083799a02a0432cf3bad7e3b1f Mon Sep 17 00:00:00 2001 From: ganeodolu Date: Thu, 2 Jan 2020 18:50:14 +0900 Subject: [PATCH 01/18] M3 first commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit modal 튜토리얼(노마드코더) --- mission003/ganeodolu/css/style.css | 46 ++++++++++++++++++ mission003/ganeodolu/index.html | 75 ++++++++++++++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 mission003/ganeodolu/css/style.css create mode 100644 mission003/ganeodolu/index.html diff --git a/mission003/ganeodolu/css/style.css b/mission003/ganeodolu/css/style.css new file mode 100644 index 0000000..3cd452e --- /dev/null +++ b/mission003/ganeodolu/css/style.css @@ -0,0 +1,46 @@ +body{ + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; +} +button { + all: unset; + background-color: steelblue; + color: white; + padding: 5px 20px; + border-radius: 5px; + cursor: pointer; + white-space:nowrap; +} +.modal { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +.modal_overlay { + background-color: rgba(0,0,0,0.6); + width: 100%; + height: 100%; + position: absolute; +} +.modal_content { + background-color: white; + padding: 50px 100px; + text-align: center; + position: relative; + border-radius: 10px; + width: 10px; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); +} + +h1{ + margin: 0; + white-space:nowrap; +} +.hidden { + display: none; +} \ No newline at end of file diff --git a/mission003/ganeodolu/index.html b/mission003/ganeodolu/index.html new file mode 100644 index 0000000..8ae4f27 --- /dev/null +++ b/mission003/ganeodolu/index.html @@ -0,0 +1,75 @@ + + + + + + + + Mission003 + + + + + + + + + + + \ No newline at end of file From 294126164b30542f9b8e56a91b7eae73b71c45ab Mon Sep 17 00:00:00 2001 From: ganeodolu Date: Fri, 3 Jan 2020 20:58:39 +0900 Subject: [PATCH 02/18] Revert "M3 first commit" This reverts commit 0c8c99c877a5a6083799a02a0432cf3bad7e3b1f. --- mission003/ganeodolu/css/style.css | 46 ------------------ mission003/ganeodolu/index.html | 75 ------------------------------ 2 files changed, 121 deletions(-) delete mode 100644 mission003/ganeodolu/css/style.css delete mode 100644 mission003/ganeodolu/index.html diff --git a/mission003/ganeodolu/css/style.css b/mission003/ganeodolu/css/style.css deleted file mode 100644 index 3cd452e..0000000 --- a/mission003/ganeodolu/css/style.css +++ /dev/null @@ -1,46 +0,0 @@ -body{ - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; -} -button { - all: unset; - background-color: steelblue; - color: white; - padding: 5px 20px; - border-radius: 5px; - cursor: pointer; - white-space:nowrap; -} -.modal { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; -} - -.modal_overlay { - background-color: rgba(0,0,0,0.6); - width: 100%; - height: 100%; - position: absolute; -} -.modal_content { - background-color: white; - padding: 50px 100px; - text-align: center; - position: relative; - border-radius: 10px; - width: 10px; - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); -} - -h1{ - margin: 0; - white-space:nowrap; -} -.hidden { - display: none; -} \ No newline at end of file diff --git a/mission003/ganeodolu/index.html b/mission003/ganeodolu/index.html deleted file mode 100644 index 8ae4f27..0000000 --- a/mission003/ganeodolu/index.html +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - Mission003 - - - - - - - - - - - \ No newline at end of file From 677875883afe13ebb5e761caddd2ecb78098219d Mon Sep 17 00:00:00 2001 From: ganeodolu Date: Fri, 3 Jan 2020 21:07:17 +0900 Subject: [PATCH 03/18] M3 revert commit --- mission003/ganeodolu/css/style.css | 47 ++++++++++++++++++ mission003/ganeodolu/index.html | 76 ++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 mission003/ganeodolu/css/style.css create mode 100644 mission003/ganeodolu/index.html diff --git a/mission003/ganeodolu/css/style.css b/mission003/ganeodolu/css/style.css new file mode 100644 index 0000000..c31d5a5 --- /dev/null +++ b/mission003/ganeodolu/css/style.css @@ -0,0 +1,47 @@ +@@ -1,46 +0,0 @@ +body{ + font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; +} +button { + all: unset; + background-color: steelblue; + color: white; + padding: 5px 20px; + border-radius: 5px; + cursor: pointer; + white-space:nowrap; +} +.modal { + position: fixed; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} + +.modal_overlay { + background-color: rgba(0,0,0,0.6); + width: 100%; + height: 100%; + position: absolute; +} +.modal_content { + background-color: white; + padding: 50px 100px; + text-align: center; + position: relative; + border-radius: 10px; + width: 10px; + box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); +} + +h1{ + margin: 0; + white-space:nowrap; +} +.hidden { + display: none; +} \ No newline at end of file diff --git a/mission003/ganeodolu/index.html b/mission003/ganeodolu/index.html new file mode 100644 index 0000000..ef2816f --- /dev/null +++ b/mission003/ganeodolu/index.html @@ -0,0 +1,76 @@ +@@ -1,75 +0,0 @@ + + + + + + + + Mission003 + + + + + + + + + + + \ No newline at end of file From aa5778dabc5e84ed76eaa83e4bb283b5821aaacd Mon Sep 17 00:00:00 2001 From: ganeodolu Date: Sun, 12 Jan 2020 19:59:35 +0900 Subject: [PATCH 04/18] =?UTF-8?q?M3=20eastjun=EC=9D=98=20index,=20css=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mission003/ganeodolu/css/index.css | 178 +++++++++++++++++++++++++++++ mission003/ganeodolu/css/style.css | 47 -------- mission003/ganeodolu/index.html | 178 +++++++++++++++++++---------- 3 files changed, 296 insertions(+), 107 deletions(-) create mode 100644 mission003/ganeodolu/css/index.css delete mode 100644 mission003/ganeodolu/css/style.css diff --git a/mission003/ganeodolu/css/index.css b/mission003/ganeodolu/css/index.css new file mode 100644 index 0000000..714623f --- /dev/null +++ b/mission003/ganeodolu/css/index.css @@ -0,0 +1,178 @@ +/*mdc override*/ +:root { + --mdc-theme-primary: #333; +} + +.mdc-button__raised:not(:disabled), .mdc-button__unelevated:not(:disabled) { + background-color: var(--mdc-theme-primary,#333); +} + +.mdc-dialog__surface { + width: 400px; +} + +.mdc-card__actions { + padding: 0; +} + +.mdc-text-field { + margin: 10px auto; +} + +.mdc-dialog__actions { + padding-right: 0; +} +/*mdc override*/ + +body { + margin: 0; +} + +.background-img { + background-size: cover; + background-image: url("https://user-images.githubusercontent.com/56821976/71782829-d68f7000-3021-11ea-833d-9e286c629503.jpg"); + position: fixed; + width: 100%; + height: 50vh; +} + +.dark-overlay { + width: 100%; + background-color: rgba(0,0,0,.2); + height: 50vh; + z-index: 10; +} + +.signup-card { + max-width: 400px; + margin: 100px auto; +} + +.signup-card h2{ + margin-top: 32px; +} + +form.signup { + padding: 24px; +} + +.text-center { + text-align: center; +} + +.hidden { + display: none; +} + +.bullet-o{ + display: flex; + flex-flow: row wrap; + justify-content: center; +} + +.bullet-o > div{ + height: 15px; + width: 15px; + margin: 20px 10px; + border-radius: 100px; + z-index: 2; +} + +.bullet{ + background-color: lightgrey; + +} + +.bullet-active{ + background-color: #333 !important; +} + +.bullet-line{ + opacity: 0.3; + background: lightgrey; + height: 3px; + width: 70px; + display: block; + left: 50%; + margin-top: -29px; + margin-left: -35px; + position: absolute; + z-index: 1; +} + +.pdd-top-0 { + padding-top: 0px !important; +} + +.width-100 { + width: 100%; +} + +.flex-container { + display: flex; +} + +.mrg-right-10 { + margin-right: 10px; +} + +#add-family-button { + display: block; + margin: 0 auto; +} + +.stepper { + position: relative; +} + +.coffee-emoji { + font-size: 100px; + margin: 40px 0 70px 0; +} + +.margin-center { + margin: 0% auto; +} + +.my-info-view-container { + display: flex; + justify-content: center; + align-items: center; + height: 100vh; +} + +.text-bold { + font-weight: bold; +} + +.my-info { + padding: 30px; +} + +.my-info-card { + width: 400px; + padding: 30px; + position: relative; +} + +#my-info-edit-button { + top: 16px; + right: 16px; + position: absolute; +} + +.no-margin { + margin: 0px; +} + +.margin-16 { + margin: 16px; +} + +.margin-8 { + margin: 8px; +} + +.text-gray { + color: gray; +} diff --git a/mission003/ganeodolu/css/style.css b/mission003/ganeodolu/css/style.css deleted file mode 100644 index c31d5a5..0000000 --- a/mission003/ganeodolu/css/style.css +++ /dev/null @@ -1,47 +0,0 @@ -@@ -1,46 +0,0 @@ -body{ - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; -} -button { - all: unset; - background-color: steelblue; - color: white; - padding: 5px 20px; - border-radius: 5px; - cursor: pointer; - white-space:nowrap; -} -.modal { - position: fixed; - top: 0; - left: 0; - width: 100%; - height: 100%; - display: flex; - justify-content: center; - align-items: center; -} - -.modal_overlay { - background-color: rgba(0,0,0,0.6); - width: 100%; - height: 100%; - position: absolute; -} -.modal_content { - background-color: white; - padding: 50px 100px; - text-align: center; - position: relative; - border-radius: 10px; - width: 10px; - box-shadow: 0 10px 20px rgba(0,0,0,0.19), 0 6px 6px rgba(0,0,0,0.23); -} - -h1{ - margin: 0; - white-space:nowrap; -} -.hidden { - display: none; -} \ No newline at end of file diff --git a/mission003/ganeodolu/index.html b/mission003/ganeodolu/index.html index ef2816f..d09f2a0 100644 --- a/mission003/ganeodolu/index.html +++ b/mission003/ganeodolu/index.html @@ -1,76 +1,134 @@ -@@ -1,75 +0,0 @@ - - - - - Mission003 - - + + mission003 + + + + + - - - + + - - + +
+ - \ No newline at end of file + + + From 740478e9b171f4bb335741e266fe08cd47c19185 Mon Sep 17 00:00:00 2001 From: ganeodolu Date: Mon, 13 Jan 2020 15:04:09 +0900 Subject: [PATCH 05/18] =?UTF-8?q?M3=20modal=20=EC=9D=B4=ED=95=B4=ED=95=98?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mission003/ganeodolu/css/index.css | 4 +- mission003/ganeodolu/index.html | 190 ++++++++++++++--------------- mission003/ganeodolu/js/App.js | 6 + mission003/ganeodolu/js/main.js | 3 + 4 files changed, 104 insertions(+), 99 deletions(-) create mode 100644 mission003/ganeodolu/js/App.js create mode 100644 mission003/ganeodolu/js/main.js diff --git a/mission003/ganeodolu/css/index.css b/mission003/ganeodolu/css/index.css index 714623f..9f7bb44 100644 --- a/mission003/ganeodolu/css/index.css +++ b/mission003/ganeodolu/css/index.css @@ -28,13 +28,13 @@ body { margin: 0; } -.background-img { +/* .background-img { background-size: cover; background-image: url("https://user-images.githubusercontent.com/56821976/71782829-d68f7000-3021-11ea-833d-9e286c629503.jpg"); position: fixed; width: 100%; height: 50vh; -} +} */ .dark-overlay { width: 100%; diff --git a/mission003/ganeodolu/index.html b/mission003/ganeodolu/index.html index d09f2a0..08e4d62 100644 --- a/mission003/ganeodolu/index.html +++ b/mission003/ganeodolu/index.html @@ -1,5 +1,6 @@ + mission003 @@ -9,126 +10,121 @@ + -
-
-
-
- -
-
-
-

회원가입

-
-
-
-
-
+ +
+
+
+ +
+
+
+

회원가입

+
+
+
+
+
+
+
-
-
-
-