fixes for custom titlebar

app/styles/areas/_app.scss

@@ -47,7 +47,7 @@
         }
         .titlebar-custom.titlebar-hidden &,
         .titlebar-custom.titlebar-hidden-inset & {
-            padding-top: $custom-titlebar-height;
+            padding-top: $titlebar-custom-height;
         }
         .fullscreen .app & {
             padding-top: 0;
@@ -127,9 +127,7 @@
                 display: flex;
             }
         }
-        .titlebar-custom & {
-            margin-top: $custom-titlebar-height;
-        }
+        @include padding-if-titlebar;
     }
 
     &__panel {

app/styles/areas/_generator-presets.scss

@@ -9,6 +9,7 @@
     user-select: none;
     overflow: hidden;
     position: relative;
+    @include padding-if-titlebar;
 
     > .scroller {
         flex: 1;

app/styles/areas/_grp.scss

@@ -9,6 +9,7 @@
     user-select: none;
     overflow: hidden;
     position: relative;
+    @include padding-if-titlebar;
 
     > .scroller {
         flex: 1;

app/styles/areas/_import-csv.scss

@@ -3,6 +3,8 @@
     display: flex;
     flex-direction: column;
     flex: 1;
+    position: relative;
+    @include padding-if-titlebar;
 
     &__body {
         @include scrollbar-on-hover;

app/styles/areas/_settings.scss

@@ -8,6 +8,7 @@
     @include scrollbar-on-hover;
     overflow: hidden;
     position: relative;
+    @include padding-if-titlebar;
 
     &__content {
         margin: $medium-padding;

app/styles/areas/_tag.scss

@@ -7,6 +7,7 @@
     width: 100%;
     user-select: none;
     padding: $medium-padding;
+    @include padding-if-titlebar;
 
     &__space {
         flex: 1;

app/styles/areas/_titlebar.scss

@@ -7,7 +7,7 @@
         left: 0;
         width: 100vw;
         display: flex;
-        height: $custom-titlebar-height;
+        height: $titlebar-custom-height;
     }
 
     &__logo {
@@ -24,7 +24,7 @@
     > .fa {
         font-size: 16px;
         padding: 4px 16px;
-        height: $custom-titlebar-height;
+        height: $titlebar-custom-height;
         box-sizing: border-box;
         &:hover {
             background: var(--titlebar-button-background-color);

app/styles/base/_variables.scss

@@ -86,5 +86,5 @@ $tablet-width: 736px;
 $mobile-width: 620px;
 
 // Title bar and window buttons
-$custom-titlebar-height: 32px;
+$titlebar-custom-height: 32px;
 $titlebar-close-button-background-color: #d71525;

app/styles/common/_titlebar.scss

@@ -0,0 +1,5 @@
+@mixin padding-if-titlebar {
+    .titlebar-custom & {
+        margin-top: $titlebar-custom-height;
+    }
+}

app/styles/main.scss

@@ -23,6 +23,7 @@ $fa-font-path: '~font-awesome/fonts';
 @import 'common/modal';
 @import 'common/scroll';
 @import 'common/tip';
+@import 'common/titlebar';
 
 @import 'areas/app';
 @import 'areas/auto-type';