Yuki Takei 2 лет назад
Родитель
Сommit
42b74b2ad7

+ 24 - 4
apps/app/src/components/Sidebar/AppTitle/AppTitle.module.scss

@@ -27,12 +27,32 @@
 
 
 // == Location
 // == Location
 .on-subnavigation {
 .on-subnavigation {
-  $grw-contextual-sub-navigation-width: 500px;
-
   top: 0;
   top: 0;
-  left: var.$grw-sidebar-nav-width;
+
+  @include bs.media-breakpoint-up(sm) {
+    left: var.$grw-sidebar-nav-width;
+  }
+}
+
+
+// == App title truncation
+.on-subnavigation {
   // set width for truncation
   // set width for truncation
-  width: calc(100vw - $grw-contextual-sub-navigation-width);
+  $grw-page-controls-width: 226px;
+  $grw-page-editor-mode-manager-width: 90px;
+  $grw-contextual-subnavigation-padding-right: 8px;
+  $gap: 8px;
+  width: calc(100vw - #{$grw-page-controls-width + $grw-page-editor-mode-manager-width + $grw-contextual-subnavigation-padding-right + $gap * 2});
+
+  @include bs.media-breakpoint-up(sm) {
+    width: calc(100vw - #{var.$grw-sidebar-nav-width + $grw-page-controls-width + $grw-page-editor-mode-manager-width + $grw-contextual-subnavigation-padding-right + $gap * 2});
+  }
+
+  @include bs.media-breakpoint-up(md) {
+    $grw-page-editor-mode-manager-width: 140px;
+    $gap: 24px;
+    width: calc(100vw - #{var.$grw-sidebar-nav-width + $grw-page-controls-width + $grw-page-editor-mode-manager-width + $grw-contextual-subnavigation-padding-right + $gap * 2});
+  }
 }
 }
 
 
 .on-sidebar-head {
 .on-sidebar-head {

+ 1 - 1
apps/app/src/components/Sidebar/Sidebar.tsx

@@ -191,7 +191,7 @@ export const Sidebar = (): JSX.Element => {
   return (
   return (
     <>
     <>
       { sidebarMode != null && isDrawerMode() && (
       { sidebarMode != null && isDrawerMode() && (
-        <DrawerToggler className="position-fixed">
+        <DrawerToggler className="position-fixed d-none d-sm-block">
           <span className="material-symbols-outlined">reorder</span>
           <span className="material-symbols-outlined">reorder</span>
         </DrawerToggler>
         </DrawerToggler>
       ) }
       ) }