merge updates

novakda · Sep 1, 2023 · a2ff638 · a2ff638
1 parent 0f7f9ad
commit a2ff638
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 14 deletions.
diff --git a/src/main/frontend/components/settings.css b/src/main/frontend/components/settings.css
@@ -81,6 +81,8 @@
       color: or(--lx-gray-12, --ls-primary-text-color);
     }
 
+  }
+
   &-inner {
     @apply flex flex-col md:flex-row;
 

diff --git a/tailwind.all.css b/tailwind.all.css
@@ -10,24 +10,13 @@
 @import "packages/amplify/dist/amplify.css";
 @import "tldraw/apps/tldraw-logseq/src/styles.css";
 @import "katex/dist/katex.min.css";
-@import "resources/css/codemirror.min.css";
-@import "resources/css/codemirror.solarized.css";
-@import "resources/css/codemirror.lsradix.css";
-@import "resources/css/show-hint.css";
-@import "resources/css/shui.css";
-
-@import "resources/css/radix.css";
-@import "resources/css/animation.css";
-@import "resources/css/table.css";
-@import "resources/css/datepicker.css";
-@import "resources/css/highlight.css";
-@import "resources/css/tooltip.css";
-@import "resources/css/common.css";
-@import "resources/css/srs_cards.css";
 @import "codemirror/lib/codemirror.css";
 @import "codemirror/theme/solarized.css";
 @import "codemirror/addon/hint/show-hint.css";
 @import "react-tippy/dist/tippy.css";
 @import "pdfjs-dist/web/pdf_viewer.css";
 @import "resources/css/tabler-extension.css";
+@import "resources/css/shui.css";
+@import "resources/css/codemirror.lsradix.css";
+@import "resources/css/radix.css";
 @import-glob "src/main/frontend/**/[!_]*.css";
-Original file line number
+Diff line change
@@ Expand Up / @@ -81,6 +81,8 @@ @@
           color: or(--lx-gray-12, --ls-primary-text-color);
         }
+      }
       &-inner {
         @apply flex flex-col md:flex-row;
@@ Expand Down @@