Browse Source

A bunch of sanity in `search palette CSS` (#7334)

* legacy style fix: clean `#search-wrapper svg` css

* search palette css review; `--ls-search-icon-color` var reabilitation

Co-authored-by: Konstantinos <[email protected]>
Co-authored-by: Gabriel Horner <[email protected]>
Sergey Kolesnik 2 years ago
parent
commit
8b8fe908c0

+ 12 - 10
resources/css/common.css

@@ -82,8 +82,9 @@ html[data-theme='dark'] {
   --ls-scrollbar-thumb-hover-color: rgba(255, 255, 255, 0.2);
   --ls-cloze-text-color: #8fbc8f;
   --ls-icon-color: var(--ls-link-text-color);
-  --ls-search-icon-color: var(--ls-link-text-color);
-  --ls-a-chosen-bg: var(--ls-secondary-background-color);
+  --ls-search-icon-color: var(--ls-primary-text-color);
+  --ls-search-icon-hover-color: var(--ls-secondary-text-color);
+  --ls-a-chosen-bg: var(--ls-quaternary-background-color);
   --ls-pie-bg-color: #01303b;
   --ls-pie-fg-color: #0b5869;
   --ls-highlight-color-gray: var(--color-gray-900);
@@ -119,11 +120,11 @@ html[data-theme='light'] {
   --ls-secondary-background-color: #f7f7f7;
   --ls-tertiary-background-color: #eaeaea;
   --ls-quaternary-background-color: #dcdcdc;
-  --ls-table-tr-even-background-color: #f7f7f7;
+  --ls-table-tr-even-background-color: var(--ls-secondary-background-color);
   --ls-active-primary-color: rgb(0, 105, 182);
   --ls-active-secondary-color: #00477c;
-  --ls-block-properties-background-color: #f7f7f7;
-  --ls-page-properties-background-color: #f7f7f7;
+  --ls-block-properties-background-color: var(--ls-secondary-background-color);
+  --ls-page-properties-background-color: var(--ls-secondary-background-color);
   --ls-block-ref-link-text-color: #d8e1e8;
   --ls-border-color: #ccc;
   --ls-secondary-border-color: #e2e2e2;
@@ -135,8 +136,8 @@ html[data-theme='light'] {
   --ls-title-text-color: var(--ls-header-button-background);
   --ls-link-text-color: #106ba3;
   --ls-link-text-hover-color: #1a537c;
-  --ls-link-ref-text-color: #106ba3;
-  --ls-link-ref-text-hover-color: #1a537c;
+  --ls-link-ref-text-color: var(--ls-link-text-color);
+  --ls-link-ref-text-hover-color: var(--ls-link-text-hover-color);
   --ls-tag-text-color: var(--ls-link-ref-text-color);
   --ls-tag-text-hover-color: var(--ls-link-ref-text-hover-color);
   --ls-slide-background-color: #fff;
@@ -152,15 +153,16 @@ html[data-theme='light'] {
   --ls-page-blockquote-border-color: #799bbc;
   --ls-page-mark-color: #262626;
   --ls-page-mark-bg-color: #fef3ac;
-  --ls-page-inline-code-bg-color: #f7f7f7;
+  --ls-page-inline-code-bg-color: var(--ls-secondary-background-color);
   --ls-page-inline-code-color: var(--ls-primary-text-color);
   --ls-scrollbar-foreground-color: rgba(0, 0, 0, 0.1);
   --ls-scrollbar-background-color: rgba(0, 0, 0, 0.05);
   --ls-scrollbar-thumb-hover-color: rgba(0, 0, 0, 0.2);
   --ls-cloze-text-color: #0000cd;
   --ls-icon-color: #646464;
-  --ls-search-icon-color: var(--ls-icon-color);
-  --ls-a-chosen-bg: #f7f7f7;
+  --ls-search-icon-color: var(--ls-primary-text-color);
+  --ls-search-icon-hover-color: var(--ls-secondary-text-color);
+  --ls-a-chosen-bg: var(--ls-quaternary-background-color);
   --ls-pie-bg-color: #e1e1e1;
   --ls-pie-fg-color: #0a4a5d;
   --ls-highlight-color-gray: var(--color-gray-100);

+ 28 - 4
src/main/frontend/components/command_palette.css

@@ -18,11 +18,35 @@
       border: none;
       border-radius: unset !important;
       background: none;
-    }
 
-    .chosen {
-      background-color: var(--ls-quaternary-background-color);
-      color: var(--ls-secondary-text-color);
+      .type-icon {
+        color: var(--ls-search-icon-color);
+
+        &.highlight {
+          color: var(--ls-selection-text-color);
+          border-color: var(--ls-selection-background-color);
+
+          &:before {
+            opacity: 0.5;
+            background: var(--ls-selection-background-color);
+          }
+        }
+      }
+
+      &.chosen .type-icon,
+      &:hover .type-icon {
+        color: var(--ls-search-icon-hover-color);
+      }
+
+      &.chosen,
+      &.chosen p {
+        background-color: var(--ls-a-chosen-bg);
+        color: var(--ls-secondary-text-color);
+      }
+
+      &:hover p {
+        color: var(--ls-secondary-text-color);
+      }
     }
 
     .command-results-wrap,

+ 0 - 11
src/main/frontend/components/search.css

@@ -11,17 +11,6 @@
   }
 }
 
-#search-wrapper svg {
-  color: var(--ls-search-icon-color, #9fa6b2);
-  opacity: 0.6;
-  transition: .3s;
-}
-
-#search-wrapper:hover svg, #search-wrapper:focus-within svg {
-  color: var(--ls-link-text-hover-color, #4b5563);
-  opacity: 0.8;
-}
-
 #search-wrapper {
   transition: .3s;
   padding-right: 12px;

+ 0 - 10
src/main/frontend/ui.css

@@ -378,14 +378,4 @@ html.is-mobile {
     background: var(--ls-primary-background-color);
     content: " ";
   }
-
-  &.highlight {
-    color: var(--ls-selection-text-color);
-    border-color: var(--ls-selection-background-color);
-
-    &:before {
-      opacity: 0.5;
-      background: var(--ls-selection-background-color);
-    }
-  }
 }