Merge pull request #4 from minyoongi96/poster

Poster
minyoongi96 · Aug 28, 2024 · 935bf68 · 935bf68
2 parents c0f19b5 + 4b11351
commit 935bf68
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -37,5 +37,4 @@ docs:
           - title: "Git"
             url: git/
             category: "git"
-
-
+
diff --git a/_includes/nav_list b/_includes/nav_list
@@ -12,6 +12,7 @@
           {% else %}
             <span class="nav__sub-title">{{ nav.title }}</span>
           {% endif %}
+<<<<<<< HEAD
           {% if nav.children != null %}
           <ul>
             {% for child in nav.children %}
@@ -21,6 +22,18 @@
           {% endif %}
         </li>
       {% endfor %}
+=======
+
+        {% if nav.children != null %}
+        <ul>
+          {% for child in nav.children %}
+          {% assign category = site.categories[child.category] | where_exp: "item", "item.hidden != true" %}
+            <li><a href="{{ child.url | relative_url }}"{% if child.url == page.url %} class="active"{% endif %}>{{ child.title }} ({{ category.size }})</a></li>
+          {% endfor %}
+        </ul>
+        {% endif %}
+      </li>
+>>>>>>> master
     {% endfor %}
   </ul>
 </nav>
diff --git a/_posts/2024-05-22-aws09_S3에 대한 기본 개념.md b/_posts/2024-05-22-aws09_S3에 대한 기본 개념.md
@@ -9,7 +9,6 @@ post-header: false
 
 --- 
 
-
 ## S3 (Simple Storage Service)의 특징
 
 안전하고 가변적인 Object 저장공간을 제공한다. (ex. Google Cloud)