Merge pull request #1560 from ecency/feature/ecency-perks

Fixed vote slider on mobile and its icons
ecency · Feb 27, 2024 · bd55af8 · bd55af8
2 parents 01aea16 + a15097b
commit bd55af8
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 17 deletions.
diff --git a/src/common/components/comment/__snapshots__/index.spec.tsx.snap b/src/common/components/comment/__snapshots__/index.spec.tsx.snap
@@ -219,7 +219,7 @@ exports[`(1) Default render 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker-24b7277e-9cbe-4335-bbc5-e12f5db84dcd"
+      id="editor-tool-emoji-picker-94ffd8dd-0f14-4aa3-8ab0-a8acb7644a8b"
       role="none"
       title="Emoji"
     >
@@ -584,7 +584,7 @@ exports[`(2) Cancellable, in progress 1`] = `
     </div>
     <div
       className="editor-tool"
-      id="editor-tool-emoji-picker-7c4ec71d-f920-4ed5-ab33-a7dd36cc19b8"
+      id="editor-tool-emoji-picker-58b875a4-80f0-4959-8fe3-49734b8519bc"
       role="none"
       title="Emoji"
     >

diff --git a/src/common/components/decks/deck-toolbar/deck-toolbar.tsx b/src/common/components/decks/deck-toolbar/deck-toolbar.tsx
@@ -89,6 +89,7 @@ export const DeckToolbar = ({ isExpanded, setIsExpanded, history }: Props) => {
           setIsExpanded={setIsExpanded}
         />
         <DeckToolbarBaseActions
+          history={history}
           isExpanded={isExpanded}
           history={history}
           setIsExpanded={setIsExpanded}

diff --git a/src/common/components/entry-vote-btn/_index.scss b/src/common/components/entry-vote-btn/_index.scss
@@ -1,4 +1,5 @@
 @import "src/style/vars_mixins";
+@import "../decks/columns/helpers/helpers";
 
 .entry-vote-btn {
   margin-right: 10px;
@@ -256,6 +257,10 @@
   display: inline-block;
 }
 
+.tooltip-vote {
+  @include compact_vote_slider();
+}
+
 .tooltip-vote .tooltiptext {
   width: 32vw;
   @apply text-dark-200;

diff --git a/src/common/img/_index.scss b/src/common/img/_index.scss
@@ -1,16 +1,18 @@
 .vote-svg {
-    width: 8px !important;
-    max-height: 6px !important;
+  min-width: 8px !important;
+  min-height: 6px !important;
+  max-width: 8px !important;
+  max-height: 6px !important;
 }
-  
+
 .slider-svg-up {
-    width: 12px !important;
-    max-height: 7px !important;
-    margin-bottom: 1px;
+  width: 12px !important;
+  max-height: 7px !important;
+  margin-bottom: 1px;
 }
-  
+
 .slider-svg-down {
-    width: 12px !important;
-    max-height: 7px !important;
-    margin-top: 1px;
+  width: 12px !important;
+  max-height: 7px !important;
+  margin-top: 1px;
 }
diff --git a/src/style/_mixins.scss b/src/style/_mixins.scss
@@ -2,9 +2,9 @@
   @if $theme == "day" {
     @content;
   } @else if $theme == "night" {
-      .dark & {
-        @content;
-      }
+    .dark & {
+      @content;
+    }
   }
 }
 
@@ -280,6 +280,7 @@
         white-space: nowrap;
         @include multiLineEllipsis($lineHeight: 1.5em, $lineCount: 2);
       }
+
       .item-nsfw {
         margin-bottom: 9px;
 
@@ -356,8 +357,10 @@
   }
 
   svg {
-    width: 14px;
-    height: 14px;
+    min-width: 14px;
+    min-height: 14px;
+    max-width: 14px;
+    max-height: 14px;
   }
 
   //animation for upvote in progress