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

feat: fix emoji styling

https://youtrack.weseek.co.jp/issue/GW-7732
- Remove _emoji-mart scss file
- Update import of emoji-mart css file
- Remove unused import
I Komang Mudana 4 лет назад
Родитель
Сommit
fd9fe9a9bf

+ 0 - 1
packages/app/src/components/PageEditor/EmojiPicker.tsx

@@ -1,5 +1,4 @@
 import React, { FC, useRef, useEffect } from 'react';
-import 'emoji-mart/css/emoji-mart.css';
 import { Picker } from 'emoji-mart';
 import EmojiPickerHelper, { getEmojiTranslation } from './EmojiPickerHelper';
 

+ 0 - 10
packages/app/src/styles/_emoji-mart.scss

@@ -1,10 +0,0 @@
-// Override emoji-mart style
-nav.emoji-mart-anchors {
-  display: flex !important;
-}
-
-.emoji-mart-category {
-  .emoji-mart-emoji span {
-    cursor: pointer !important;
-  }
-}

+ 3 - 0
packages/app/src/styles/_vendor.scss

@@ -23,3 +23,6 @@
 
 // import Handsontable styles
 @import '~handsontable/dist/handsontable.full.css';
+
+// Emoji-mart style
+@import '~emoji-mart/css/emoji-mart.css';

+ 0 - 1
packages/app/src/styles/style-app.scss

@@ -73,7 +73,6 @@
 @import 'wiki';
 @import 'sharelink';
 @import 'linkedit-preview';
-@import 'emoji-mart';
 
 /*
  * for Guest User Mode

+ 1 - 17
packages/app/src/styles/theme/_apply-colors.scss

@@ -45,6 +45,7 @@ $nav-tabs-link-active-border-color: $bordercolor-nav-tabs-active;
 @import 'reboot-bootstrap-theme-colors';
 @import 'reboot-bootstrap-nav';
 @import 'reboot-toastr-colors';
+@import '~emoji-mart/css/emoji-mart.css'; // Emoji-mart style
 
 // determine variables with bootstrap function (These variables can be used after importing bootstrap above)
 $color-modal-header: color-yiq($primary) !default;
@@ -738,20 +739,3 @@ mark.rbt-highlight-text {
   height: 7px;
   background-color: $primary;
 }
-
-/**
-  Emoji mart style
-*/
-.emoji-mart {
-  .emoji-mart-anchor-selected {
-    .emoji-mart-anchor-bar {
-      height: 3px;
-    }
-    svg {
-       fill: $purple;
-    }
-  }
-  .emoji-mart-anchor-bar {
-    height: 0px;
-  }
-}