v0.1.13 상단 토글 및 좌측 패널 구조 수정

assets/built/screen.css

@@ -125,72 +125,15 @@ input {
     overflow-y: auto;
 }
 
-.sidebar-left__toolbar {
+body.left-sidebar-collapsed .site-shell {
-    display: flex;
+    width: calc(var(--content-column) + var(--sidebar-right));
-    justify-content: flex-end;
+    grid-template-columns: minmax(0, var(--content-column)) var(--sidebar-right);
-    padding-top: 12px;
 }
 
-.sidebar-left__toggle {
+body.left-sidebar-collapsed .sidebar--left {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-    width: 28px;
-    height: 28px;
-    border: 0;
-    background: transparent;
-    color: var(--text-dim);
-    cursor: pointer;
-    border-radius: 8px;
-}
-
-.sidebar-left__toggle:hover {
-    background: var(--surface-muted);
-}
-
-.sidebar-left__toggle-icon {
-    width: 18px;
-    height: 18px;
-}
-
-.sidebar-left__toggle-icon--close {
     display: none;
 }
 
-body.left-sidebar-collapsed .site-shell,
-body.left-sidebar-collapsed .topbar {
-    grid-template-columns: 56px minmax(0, var(--content-column)) var(--sidebar-right);
-}
-
-body.left-sidebar-collapsed .sidebar-left__toggle-icon--open {
-    display: none;
-}
-
-body.left-sidebar-collapsed .sidebar-left__toggle-icon--close {
-    display: block;
-}
-
-body.left-sidebar-collapsed .sidebar--left .menu-link__label,
-body.left-sidebar-collapsed .sidebar--left .menu-group__content,
-body.left-sidebar-collapsed .sidebar--left .sidebar-card,
-body.left-sidebar-collapsed .sidebar--left .sidebar-footer {
-    opacity: 0;
-    pointer-events: none;
-}
-
-body.left-sidebar-collapsed .sidebar--left .menu-group__trigger {
-    justify-content: center;
-    padding-inline: 0;
-}
-
-body.left-sidebar-collapsed .sidebar--left .menu-group__chevron {
-    display: none;
-}
-
-body.left-sidebar-collapsed .sidebar--left .menu-link {
-    justify-content: center;
-}
-
 .sidebar__inner--right {
     display: flex;
     flex-direction: column;
@@ -525,6 +468,51 @@ body.left-sidebar-collapsed .sidebar--left .menu-link {
     height: 100%;
     display: flex;
     align-items: center;
+    gap: 12px;
+}
+
+.topbar__sidebar-toggle {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 28px;
+    height: 28px;
+    border: 0;
+    background: transparent;
+    color: var(--text-dim);
+    cursor: pointer;
+    border-radius: 8px;
+    padding: 0;
+}
+
+.topbar__sidebar-toggle:hover {
+    background: var(--surface-muted);
+}
+
+.topbar__sidebar-toggle-icon {
+    width: 18px;
+    height: 18px;
+    display: block;
+}
+
+.topbar__sidebar-toggle-icon--close {
+    display: none;
+}
+
+body.left-sidebar-collapsed .topbar__sidebar-toggle-icon--open {
+    display: block;
+}
+
+body.left-sidebar-collapsed .topbar__sidebar-toggle-icon--close {
+    display: none;
+}
+
+body:not(.left-sidebar-collapsed) .topbar__sidebar-toggle-icon--open {
+    display: none;
+}
+
+body:not(.left-sidebar-collapsed) .topbar__sidebar-toggle-icon--close {
+    display: block;
 }
 
 .topbar__search {
@@ -1377,9 +1365,9 @@ body.left-sidebar-collapsed .sidebar--left .menu-link {
         border-right: 0;
     }
 
-    body.left-sidebar-collapsed .site-shell,
+    body.left-sidebar-collapsed .site-shell {
-    body.left-sidebar-collapsed .topbar {
+        width: min(100%, var(--content-column));
-        grid-template-columns: 56px minmax(0, 1fr);
+        grid-template-columns: minmax(0, 1fr);
     }
 
     .sidebar--right {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost-theme-thred-clone",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": true,
   "description": "A Ghost theme inspired by the Thred reference layout.",
   "keywords": [

partials/site/sidebar-left.hbs

@@ -1,11 +1,5 @@
 <aside class="sidebar sidebar--left">
     <div class="sidebar__inner">
-        <div class="sidebar-left__toolbar">
-            <button class="sidebar-left__toggle" type="button" data-left-sidebar-toggle aria-expanded="true" aria-label="Collapse left sidebar">
-                <img class="sidebar-left__toggle-icon sidebar-left__toggle-icon--open" src="{{asset "icons/left_panel_open.svg"}}" alt="">
-                <img class="sidebar-left__toggle-icon sidebar-left__toggle-icon--close" src="{{asset "icons/left_panel_close.svg"}}" alt="">
-            </button>
-        </div>
         <nav class="menu-groups">
             <section class="menu-group is-open">
                 <button class="menu-group__trigger" type="button" data-accordion aria-expanded="true">

partials/site/topbar.hbs

@@ -1,12 +1,11 @@
 <header class="topbar">
     <div class="topbar__brand">
+        <button class="topbar__sidebar-toggle" type="button" data-left-sidebar-toggle aria-expanded="true" aria-label="Toggle left sidebar">
+            <img class="topbar__sidebar-toggle-icon topbar__sidebar-toggle-icon--open" src="{{asset "icons/left_panel_open.svg"}}" alt="">
+            <img class="topbar__sidebar-toggle-icon topbar__sidebar-toggle-icon--close" src="{{asset "icons/left_panel_close.svg"}}" alt="">
+        </button>
         <a class="brand brand--topbar" href="{{@site.url}}">
-            {{#if @site.logo}}
+            <span class="brand__name">{{@site.title}}</span>
-                <img class="brand__logo" src="{{@site.logo}}" alt="{{@site.title}}">
-            {{else}}
-                <span class="brand__mark"></span>
-                <span class="brand__name">{{@site.title}}</span>
-            {{/if}}
         </a>
     </div>
     <div class="topbar__search">