Просмотр исходного кода

reorganize scss for .wiki and CustomSidebar

Yuki Takei 3 лет назад
Родитель
Сommit
f282db30e9

+ 7 - 0
packages/app/src/components/Sidebar/CustomSidebar.module.scss

@@ -0,0 +1,7 @@
+@use '~/styles/organisms/wiki-custom-sidebar.scss';
+
+.grw-custom-sidebar-content :global {
+  .wiki {
+    @extend %grw-custom-sidebar-content;
+  }
+}

+ 4 - 2
packages/app/src/components/Sidebar/CustomSidebar.tsx

@@ -10,6 +10,9 @@ import loggerFactory from '~/utils/logger';
 import RevisionRenderer from '../Page/RevisionRenderer';
 import RevisionRenderer from '../Page/RevisionRenderer';
 
 
 
 
+import styles from './CustomSidebar.module.scss';
+
+
 const logger = loggerFactory('growi:cli:CustomSidebar');
 const logger = loggerFactory('growi:cli:CustomSidebar');
 
 
 
 
@@ -58,11 +61,10 @@ const CustomSidebar: FC = () => {
 
 
       {
       {
         (!isLoading && markdown != null) && (
         (!isLoading && markdown != null) && (
-          <div className="p-3">
+          <div className={`p-3 grw-custom-sidebar-content ${styles['grw-custom-sidebar-content']}`}>
             <RevisionRenderer
             <RevisionRenderer
               rendererOptions={rendererOptions}
               rendererOptions={rendererOptions}
               markdown={markdown}
               markdown={markdown}
-              additionalClassName="grw-custom-sidebar-content"
             />
             />
           </div>
           </div>
         )
         )

+ 1 - 2
packages/app/src/styles/_editor.scss

@@ -1,7 +1,7 @@
 @import './bootstrap/init' ;
 @import './bootstrap/init' ;
 @import './variables' ;
 @import './variables' ;
 @import './mixins' ;
 @import './mixins' ;
-@import 'sidebar-wiki';
+@import './organisms/wiki-custom-sidebar';
 
 
 // global imported
 // global imported
 .layout-root.editing {
 .layout-root.editing {
@@ -239,7 +239,6 @@
   &.editing-sidebar {
   &.editing-sidebar {
     .page-editor-preview-body {
     .page-editor-preview-body {
       width: 320px;
       width: 320px;
-      padding-top: 0;
       margin-right: auto;
       margin-right: auto;
       margin-left: auto;
       margin-left: auto;
 
 

+ 0 - 4
packages/app/src/styles/_sidebar-wiki.scss → packages/app/src/styles/organisms/_wiki-custom-sidebar.scss

@@ -44,7 +44,3 @@
     margin: 0;
     margin: 0;
   }
   }
 }
 }
-
-.grw-custom-sidebar-content.wiki {
-  @extend %grw-custom-sidebar-content;
-}

+ 2 - 2
packages/app/src/styles/_wiki.scss → packages/app/src/styles/organisms/_wiki.scss

@@ -1,5 +1,5 @@
-@use './variables' as var;
-@use './bootstrap/init' as bs;
+@use '../variables' as var;
+@use '../bootstrap/init' as bs;
 
 
 .wiki {
 .wiki {
   @mixin add-left-border($width) {
   @mixin add-left-border($width) {

+ 3 - 17
packages/app/src/styles/style-next.scss

@@ -34,12 +34,13 @@
 // molecules
 // molecules
 @import 'molecules/toastr';
 @import 'molecules/toastr';
 // @import 'molecules/copy-dropdown';
 // @import 'molecules/copy-dropdown';
-// @import 'molecules/page-editor-mode-manager';
 // @import 'molecules/slack-notification';
 // @import 'molecules/slack-notification';
 // @import 'molecules/duplicated-paths-table.scss';
 // @import 'molecules/duplicated-paths-table.scss';
 
 
+// organisms
+@import 'organisms/wiki';
+
 // // growi component
 // // growi component
-// @import 'admin';
 // @import 'attachments';
 // @import 'attachments';
 // @import 'comment';
 // @import 'comment';
 // @import 'comment_growi';
 // @import 'comment_growi';
@@ -49,31 +50,16 @@
 @import 'fonts';
 @import 'fonts';
 // @import 'handsontable';
 // @import 'handsontable';
 @import 'layout';
 @import 'layout';
-// @import 'login';
 // @import 'me';
 // @import 'me';
 @import 'mirror_mode';
 @import 'mirror_mode';
 @import 'modal';
 @import 'modal';
-// @import 'navbar';
 // @import 'old-ios';
 // @import 'old-ios';
 // @import 'page-duplicate-modal';
 // @import 'page-duplicate-modal';
 @import 'page-path';
 @import 'page-path';
-// @import 'page-tree';
 // @import 'page';
 // @import 'page';
-// @import 'page-presentation';
-// @import 'page-history';
-// @import 'recent-changes';
 @import 'search';
 @import 'search';
-// @import 'shortcuts';
-// @import 'sidebar';
-// @import 'sidebar-wiki';
-// @import 'subnav';
 @import 'tag';
 @import 'tag';
-// @import 'toc';
 // @import 'user';
 // @import 'user';
-// @import 'waves';
-@import 'wiki';
-// @import 'sharelink';
-// @import 'linkedit-preview';
 
 
 
 
 /*
 /*