Skip to content

TagSpaces is an offline, open source, document manager with tagging support

chore: refactoring integration external css

Ilian Sapundshiev17bdeb469bc4
diff --git a/src/renderer/app.global.css b/src/renderer/app.global.css
index 7165e7026..aefe7ef98 100644
--- a/src/renderer/app.global.css
+++ b/src/renderer/app.global.css
@@ -2,13 +2,7 @@
@import 'assets/scrollbars.css';
@import 'assets/minireset.css';
@import 'assets/fonts/roboto/index.css';
-@import '~rc-table/assets/index.css';
-@import 'assets/rc-table.css';
@import '~leaflet/dist/leaflet.css';
-@import '~react-image-gallery/styles/css/image-gallery.css';
-@import '~react-leaflet-markercluster/styles';
-@import "~@milkdown/crepe/theme/common/style.css";
-@import "~@milkdown/crepe/theme/frame.css";
@import 'assets/milkdown.css';
/* Needed to disable border on focused HotKey element */
@@ -16,10 +10,6 @@ div[tabindex='-1']:focus {
outline: 0;
}
-.tagspaces-main-color {
- color: #1dd19f;
-}
-
html,
body {
overscroll-behavior-x: none;
@@ -34,22 +24,6 @@ body {
margin: 0;
}
-.react-split > .split-container.vertical > .splitter {
- z-index: 1;
-}
-
-.rc-table-row-expand-icon {
- width: 13px !important;
- height: 13px !important;
- line-height: 13px !important;
- margin: 5px;
- cursor: pointer;
-}
-
-.rc-table-cell, .rc-table-row {
- display: block !important;
-}
-
.full-height {
height: 100%;
}
diff --git a/src/renderer/assets/milkdown.css b/src/renderer/assets/milkdown.css
index 63045acdd..c3e158bae 100644
--- a/src/renderer/assets/milkdown.css
+++ b/src/renderer/assets/milkdown.css
@@ -1,3 +1,10 @@
+@import "~@milkdown/crepe/theme/common/style.css";
+@import "~@milkdown/crepe/theme/frame.css";
+
+.milkdown * {
+ user-select: text;
+}
+
.milkdown {
--crepe-font-title: 'Open Sans', Arial, Helvetica, sans-serif !important;
}
diff --git a/src/renderer/assets/minireset.css b/src/renderer/assets/minireset.css
index b58fb957a..4f078dc17 100644
--- a/src/renderer/assets/minireset.css
+++ b/src/renderer/assets/minireset.css
@@ -34,10 +34,6 @@ img { border: 0; pointer-events: none; }
cursor: default;
}
-.milkdown * {
- user-select: text;
-}
-
input, button, textarea, :focus {
outline: none;
}
diff --git a/src/renderer/assets/rc-table.css b/src/renderer/assets/rc-table.css
deleted file mode 100644
index cbca11a4a..000000000
--- a/src/renderer/assets/rc-table.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.rc-table-content {
- border: none;
-}
-
-.rc-table-cell {
- border: none;
-}
-
-.rc-table-cell:hover {
- border-radius: 5px;
- background-color: #dcf3ec88 !important;
-}
-
-.rc-table td {
- border: none;
- padding: 8px;
- background: transparent !important;
- white-space: nowrap;
-}
-
-.rc-table tr.dropzone td {
- background-color: #1dd19f40 !important;
- border: 3px dashed white;
- padding: 5px;
-}
-
-.rc-table-row-expand-icon {
- width: 10px;
- height: 10px;
- line-height: 10px;
-}
diff --git a/src/renderer/components/DirectoryTreeView.tsx b/src/renderer/components/DirectoryTreeView.tsx
index 5654ebf3e..bf25bc2bb 100644
--- a/src/renderer/components/DirectoryTreeView.tsx
+++ b/src/renderer/components/DirectoryTreeView.tsx
@@ -32,6 +32,7 @@ import { alpha, useTheme } from '@mui/material/styles';
import { locationType } from '@tagspaces/tagspaces-common/misc';
import { cleanTrailingDirSeparator } from '@tagspaces/tagspaces-common/paths';
import Table from 'rc-table';
+import 'rc-table/assets/index.css';
import {
Ref,
forwardRef,
@@ -442,34 +443,78 @@ const DirectoryTreeView = forwardRef(
if (isExpanded && data !== undefined) {
return (
- <Table
- key={location.locationID}
- style={{
- borderRadius: AppConfig.defaultCSSRadius,
- backgroundColor: alpha(theme.palette.grey.A400, 0.2),
- marginTop: 0,
- marginBottom: 5,
- }}
- components={{
- // header: { cell: this.renderHeaderRow },
- body: { row: renderBodyRow },
- }}
- showHeader={false}
- // className="table"
- rowKey="path"
- data={data[location.locationID]}
- columns={columns}
- indentSize={20}
- expandable={{ onExpand }}
- // expandIcon={this.CustomExpandIcon}
- // expandIconAsCell
- // @ts-ignore
- onRow={(record, index) => ({
- index,
- location: record,
- handleFileMoveDrop: handleFileMoveDrop,
- })}
- />
+ <>
+ <style>
+ {`
+ .rc-table-row {
+ display: block !important;
+ }
+
+ .rc-table-content {
+ border: none;
+ }
+
+ .rc-table-cell {
+ border: none;
+ display: block !important;
+ }
+
+ .rc-table-cell:hover {
+ border-radius: 5px;
+ background-color: #dcf3ec88 !important;
+ }
+
+ .rc-table td {
+ border: none;
+ padding: 8px;
+ background: transparent !important;
+ white-space: nowrap;
+ }
+
+ .rc-table tr.dropzone td {
+ background-color: #1dd19f40 !important;
+ border: 3px dashed white;
+ padding: 5px;
+ }
+
+ .rc-table-row-expand-icon {
+ width: 13px !important;
+ height: 13px !important;
+ line-height: 13px !important;
+ margin: 5px;
+ cursor: pointer;
+ }
+ `}
+ </style>
+ <Table
+ key={location.locationID}
+ style={{
+ borderRadius: AppConfig.defaultCSSRadius,
+ backgroundColor: alpha(theme.palette.grey.A400, 0.2),
+ marginTop: 0,
+ marginBottom: 5,
+ }}
+ components={{
+ // header: { cell: this.renderHeaderRow },
+ body: { row: renderBodyRow },
+ }}
+ showHeader={false}
+ // className="table"
+ rowKey="path"
+ data={data[location.locationID]}
+ columns={columns}
+ indentSize={20}
+ expandable={{ onExpand }}
+ // expandIcon={this.CustomExpandIcon}
+ // expandIconAsCell
+ // @ts-ignore
+ onRow={(record, index) => ({
+ index,
+ location: record,
+ handleFileMoveDrop: handleFileMoveDrop,
+ })}
+ />
+ </>
);
}
return null;
diff --git a/src/renderer/containers/MainPage.tsx b/src/renderer/containers/MainPage.tsx
index 925b51a7c..29aeb2beb 100644
--- a/src/renderer/containers/MainPage.tsx
+++ b/src/renderer/containers/MainPage.tsx
@@ -344,6 +344,10 @@ function MainPage() {
flex-direction: column;
overflow: clip;
}
+
+ .react-split > .split-container.vertical > .splitter {
+ z-index: 1;
+ }
`}
</style>
{isDesktopMode || (AppConfig.isAmplify && !isLoggedIn()) ? (