From 1141d036dba62b527bb4c53eac64b80c94fb252b Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 09:59:35 +0900
Subject: [PATCH 28/38] Update header2.html
---
_includes/header2.html | 46 +++++++++++++++---------------------------
1 file changed, 16 insertions(+), 30 deletions(-)
diff --git a/_includes/header2.html b/_includes/header2.html
index d982d8c6f..f4f6468f6 100644
--- a/_includes/header2.html
+++ b/_includes/header2.html
@@ -1,3 +1,19 @@
+
+
+
+ {% assign pages_list = site.pages %}
+ {% for node in pages_list %}
+ {% if node.title != null %}
+ {% if node.layout == "category" %}
+ - {{ node.title }}
+ {% endif %}
+ {% endif %}
+ {% endfor %}
+
+
+
+
-
-
From 73ed0a0bb5441bffe6486912f958a49a1f311c1e Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:00:31 +0900
Subject: [PATCH 29/38] Update default.html
---
_layouts/default.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/_layouts/default.html b/_layouts/default.html
index 166f18338..05764e5c4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -4,7 +4,6 @@
{% include header2.html %}
- {% include page_content.html %}
{% include about.html %}
{% include contact.html %}
{% include footer.html %}
From 3c164d42f42673880703f01fefee1dcef879f37a Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:01:02 +0900
Subject: [PATCH 30/38] Update default.html
---
_layouts/default.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_layouts/default.html b/_layouts/default.html
index 05764e5c4..d0ce5bfa3 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,7 +3,7 @@
{% include head.html %}
- {% include header2.html %}
+ {% include header1.html %}
{% include about.html %}
{% include contact.html %}
{% include footer.html %}
From 302d03f09bd9f6ede621542d7df9343353c9c001 Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:01:09 +0900
Subject: [PATCH 31/38] Update default.html
---
_layouts/default.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_layouts/default.html b/_layouts/default.html
index d0ce5bfa3..8b8bb0255 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,7 +3,7 @@
{% include head.html %}
- {% include header1.html %}
+ {% include header.html %}
{% include about.html %}
{% include contact.html %}
{% include footer.html %}
From 5490d8f30959b8530482d2d63533f5c63c576db1 Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:09:44 +0900
Subject: [PATCH 32/38] Update header2.html
---
_includes/header2.html | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/_includes/header2.html b/_includes/header2.html
index f4f6468f6..894fed403 100644
--- a/_includes/header2.html
+++ b/_includes/header2.html
@@ -1,28 +1,14 @@
-
-
-
- {% assign pages_list = site.pages %}
- {% for node in pages_list %}
- {% if node.title != null %}
- {% if node.layout == "category" %}
- - {{ node.title }}
- {% endif %}
- {% endif %}
- {% endfor %}
-
-
-
-
-
+
From 430f3fa16a4b011abe444be969c363c078282139 Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:10:15 +0900
Subject: [PATCH 33/38] Update _header.css
---
css/_header.css | 159 ++++++++++++++++++++++++------------------------
1 file changed, 80 insertions(+), 79 deletions(-)
diff --git a/css/_header.css b/css/_header.css
index 2be1731fd..b45df3ef0 100644
--- a/css/_header.css
+++ b/css/_header.css
@@ -1,91 +1,92 @@
-.site-category{
- background: $brand-color;
- border-top: 1px solid $border-color;
- margin:auto;
- padding:0;
- font-size:14px;
- text-align: center;
- clear:left;
- }
+.menubar{
+border:none;
+border:0px;
+margin:0px;
+padding:0px;
+font: 67.5% "Lucida Sans Unicode", "Bitstream Vera Sans", "Trebuchet Unicode MS", "Lucida Grande", Verdana, Helvetica, sans-serif;
+font-size:14px;
+font-weight:bold;
+}
- .site-category ul{
- //background: #00aeff;
- height:50px;
- list-style:none;
- line-height: 1.5;
- margin:0 auto;
- padding:0;
- display:inline-block;
- }
+.menubar ul{
+background: rgb(109,109,109);
+height:50px;
+list-style:none;
+margin:0;
+padding:0;
+}
- .site-category li{
- float: left;
- display:inline;
+.menubar li{
+float:left;
+padding:0px;
+}
- }
+.menubar li a{
+background: rgb(109,109,109);
+color:#cccccc;
+display:block;
+font-weight:normal;
+line-height:50px;
+margin:0px;
+padding:0px 25px;
+text-align:center;
+text-decoration:none;
+}
- .site-category li a{
- background: $brand-color;
- display:block;
- font-weight:normal;
- line-height:50px;
- margin:0px;
- padding:0px 25px;
- text-align:center;
- text-decoration:none;
- }
+.menubar li a:hover, .menubar ul li:hover a{
+background: rgb(71,71,71);
+color:#FFFFFF;
+text-decoration:none;
+}
- .site-category li a:hover{
- background: rgb(71,71,71);
- color:#FFFFFF;
- text-decoration:none;
- }
+.menubar li ul{
+background: rgb(109,109,109);
+display:none; /* 평상시에는 드랍메뉴가 안보이게 하기 */
+height:auto;
+padding:0px;
+margin:0px;
+border:0px;
+position:absolute;
+width:200px;
+z-index:200;
+/*top:1em;
+/*left:0;*/
+}
- .site-category li ul{
- background: #f3f4f7;
- display:none; /* 평상시에는 드랍메뉴가 안보이게 하기 */
- height:auto;
- padding:0px;
- margin:0px;
- border:0px;
- position:absolute;
- width:200px;
- z-index:200;
- /*top:1em;
- /*left:0;*/
- }
+.menubar li:hover ul{
+display:block; /* 마우스 커서 올리면 드랍메뉴 보이게 하기 */
+}
- .site-category li:hover ul{
- display:block; /* 마우스 커서 올리면 드랍메뉴 보이게 하기 */
- }
+.menubar li li {
+background: rgb(109,109,109);
+display:block;
+float:none;
+margin:0px;
+padding:0px;
+width:200px;
+}
- .site-category li li {
- background: $brand-color;
- display:block;
- float:none;
- margin:0px;
- padding:0px;
- width:200px;
- }
+.menubar li:hover li a{
+background:none;
+}
- .site-category li:hover li a{
- background:none;
- }
+.menubar li ul a{
+display:block;
+height:50px;
+font-size:12px;
+font-style:normal;
+margin:0px;
+padding:0px 10px 0px 15px;
+text-align:left;
+}
- .site-category li ul a{
- display:block;
- height:50px;
- font-size:12px;
- font-style:normal;
- margin:0px;
- padding:0px 10px 0px 15px;
- text-align:left;
- }
+.menubar li ul a:hover, .menubar li ul li:hover a{
+background: rgb(71,71,71);
+border:0px;
+color:#ffffff;
+text-decoration:none;
+}
- .site-category li ul a:hover, .menubar li ul li:hover a{
- background: rgb(71,71,71);
- border:0px;
- color:#ffffff;
- text-decoration:none;
- }
+.menubar p{
+clear:left;
}
From 0622cde78b5f45c0d6cc6943f318e1e9f64a8262 Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:10:34 +0900
Subject: [PATCH 34/38] Update default.html
---
_layouts/default.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_layouts/default.html b/_layouts/default.html
index 8b8bb0255..05764e5c4 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -3,7 +3,7 @@
{% include head.html %}
- {% include header.html %}
+ {% include header2.html %}
{% include about.html %}
{% include contact.html %}
{% include footer.html %}
From 21593d0f4f53b0a8bec5e346e4116b419419709c Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:12:46 +0900
Subject: [PATCH 35/38] Update header2.html
---
_includes/header2.html | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/_includes/header2.html b/_includes/header2.html
index 894fed403..790d2c035 100644
--- a/_includes/header2.html
+++ b/_includes/header2.html
@@ -12,3 +12,32 @@
+
From ee9016d115c1d8b7391496c1ea504c0229ec72e4 Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:16:01 +0900
Subject: [PATCH 36/38] Update header2.html
---
_includes/header2.html | 31 +------------------------------
1 file changed, 1 insertion(+), 30 deletions(-)
diff --git a/_includes/header2.html b/_includes/header2.html
index 790d2c035..9507bf553 100644
--- a/_includes/header2.html
+++ b/_includes/header2.html
@@ -1,6 +1,6 @@
-
From 0f523e52ef78b6d6f72a833459d6b1ec66b714ec Mon Sep 17 00:00:00 2001
From: namsuji <52815908+NamSuJi@users.noreply.github.com>
Date: Fri, 26 Jul 2019 10:17:47 +0900
Subject: [PATCH 37/38] Update header2.html
---
_includes/header2.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/_includes/header2.html b/_includes/header2.html
index 9507bf553..2d13d590e 100644
--- a/_includes/header2.html
+++ b/_includes/header2.html
@@ -1,7 +1,7 @@