Skip to content

Commit

Permalink
chore: 更换图标
Browse files Browse the repository at this point in the history
  • Loading branch information
konodioda727 committed Oct 18, 2024
1 parent a0ba179 commit 011d9f9
Show file tree
Hide file tree
Showing 23 changed files with 171 additions and 47 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ dist-ssr
*.local
weapp.js
babel.config.js
app.config.ts
ec-canvas

*.js
VirtualList.tsx
src/common/components/iconfont
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
export GIT_TERMINAL_PROMPT=0
. "$(dirname -- "$0")/common.sh"

yarn lint
yarn lint --fix
3 changes: 2 additions & 1 deletion iconfont.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"save_dir": "./src/common/components/iconfont",
"use_rpx": false,
"trim_icon_prefix": "icon",
"default_icon_size": 18
"default_icon_size": 18,
"platforms": ["weapp", "qq"]
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
"taro-plugin-compiler-optimization": "^1.0.4",
"thread-loader": "^4.0.4",
"ts-node": "^10.9.2",
"typescript": "^5.6.2",
"typescript": "^5.6.3",
"weapp-tailwindcss": "^3.5.2",
"webpack": "^5.94.0"
},
Expand Down
7 changes: 3 additions & 4 deletions src/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { useGlobalIconFont } from './common/components/iconfont/helper';

export default defineAppConfig({
pages: [
'pages/login/index',
Expand Down Expand Up @@ -25,10 +27,7 @@ export default defineAppConfig({
pages: ['pages/history/index'],
},
],
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
usingComponents: Object.assign({
iconfont: '/src/common/components/iconfont',
}),
usingComponents: Object.assign(useGlobalIconFont()),
tabBar: {
custom: true,
list: [
Expand Down
2 changes: 1 addition & 1 deletion src/common/components/Comment/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import './style.scss';

import { useCourseStore } from '@/pages/main/store/store';

import IconFont from '@/common/components/iconfont';
import { CourseDetailsType, PublisherDetailsType } from '@/pages/main/store/types';
import IconFont from '../iconfont';
import ShowStar from '../showStar/showStar';

interface CommentProps extends CommentInfo {
Expand Down
10 changes: 2 additions & 8 deletions src/common/components/QuestionDetail/QuestionDetail.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
import '@/common/components/QuestionDetail/QuestionDetail';
import { Image, Text, View } from '@tarojs/components';
import React, { useEffect, useState } from 'react';

import './index.scss';

// eslint-disable-next-line import/first
import answericon from '@/common/assets/img/publishQuestion/answer.png';
// eslint-disable-next-line import/first
import askicon from '@/common/assets/img/publishQuestion/ask.png';
// eslint-disable-next-line import/first
import IconFont from '@/common/components/iconfont';
import PublishHeader from '@/common/components/PublishHeader/PublishHeader';
// eslint-disable-next-line import/first
import { useCourseStore } from '@/pages/main/store/store';

import IconFont from '../iconfont';

interface IUser {
avatar: string;
id: number;
Expand Down
2 changes: 2 additions & 0 deletions src/common/components/iconfont/helper.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
/* eslint-disable */
export declare var useGlobalIconFont: () => { iconfont: string };
9 changes: 9 additions & 0 deletions src/common/components/iconfont/helper.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-disable */
const useGlobalIconFont = () => {
return {
iconfont: `common/components/iconfont/${process.env.TARO_ENV}/${process.env.TARO_ENV}`,
};
};

// es modules is unavaiable.
module.exports.useGlobalIconFont = useGlobalIconFont;
13 changes: 13 additions & 0 deletions src/common/components/iconfont/index.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/* eslint-disable */
import React, { FunctionComponent } from 'react';

interface Props {
name: 'guanfangbanben' | 'tiwen' | 'comment' | 'like' | 'wechat' | 'yanjing' | 'yanjing1' | 'xiaxue';
size?: number;
color?: string | string[];
style?: React.CSSProperties;
}

declare const IconFont: FunctionComponent<Props>;

export default IconFont;
7 changes: 7 additions & 0 deletions src/common/components/iconfont/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/* eslint-disable */

const IconFont = () => {
return null;
};

export default IconFont;
16 changes: 16 additions & 0 deletions src/common/components/iconfont/index.qq.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* eslint-disable */

import React from 'react';


const IconFont = (props) => {
const { name, size, color, style } = props;

return <iconfont name={name} size={size} color={color} style={style} />;
};

IconFont.defaultProps = {
size: 18,
};

export default IconFont;
16 changes: 16 additions & 0 deletions src/common/components/iconfont/index.weapp.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/* eslint-disable */

import React from 'react';


const IconFont = (props) => {
const { name, size, color, style } = props;

return <iconfont name={name} size={size} color={color} style={style} />;
};

IconFont.defaultProps = {
size: 18,
};

export default IconFont;
31 changes: 31 additions & 0 deletions src/common/components/iconfont/qq/qq.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
Component({
properties: {
// guanfangbanben | tiwen | comment | like | wechat | yanjing | yanjing1 | xiaxue
name: {
type: String,
},
// string | string[]
color: {
type: null,
observer: function(color) {
this.setData({
isStr: typeof color === 'string',
});
}
},
size: {
type: Number,
value: 18,
observer: function(size) {
this.setData({
svgSize: size,
});
},
},
},
data: {
svgSize: 18,
quot: '"',
isStr: true,
},
});
4 changes: 4 additions & 0 deletions src/common/components/iconfont/qq/qq.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"component": true,
"usingComponents": {}
}
23 changes: 23 additions & 0 deletions src/common/components/iconfont/qq/qq.qml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/common/components/iconfont/qq/qq.qss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.icon {
background-repeat: no-repeat;
}
18 changes: 9 additions & 9 deletions src/common/components/iconfont/weapp/weapp.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Component({
properties: {
// comment | like | wechat | yanjing | yanjing1 | xiaxue
// guanfangbanben | tiwen | comment | like | wechat | yanjing | yanjing1 | xiaxue
name: {
type: String,
},
// string | string[]
color: {
type: null,
observer: function (color) {
observer: function(color) {
this.setData({
colors: this.fixColor(),
isStr: typeof color === 'string',
});
},
}
},
size: {
type: Number,
value: 18,
observer: function (size) {
observer: function(size) {
this.setData({
svgSize: size,
});
Expand All @@ -31,7 +31,7 @@ Component({
isStr: true,
},
methods: {
fixColor: function () {
fixColor: function() {
var color = this.data.color;
var hex2rgb = this.hex2rgb;

Expand All @@ -43,7 +43,7 @@ Component({
return item.indexOf('#') === 0 ? hex2rgb(item) : item;
});
},
hex2rgb: function (hex) {
hex2rgb: function(hex) {
var rgb = [];

hex = hex.substr(1);
Expand All @@ -52,12 +52,12 @@ Component({
hex = hex.replace(/(.)/g, '$1$1');
}

hex.replace(/../g, function (color) {
hex.replace(/../g, function(color) {
rgb.push(parseInt(color, 0x10));
return color;
});

return 'rgb(' + rgb.join(',') + ')';
},
},
}
}
});
10 changes: 8 additions & 2 deletions src/common/components/iconfont/weapp/weapp.wxml
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
<!--guanfangbanben-->
<view wx:if="{{name === 'guanfangbanben'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M782.208 530.72L724.288 448l57.92-82.72a32 32 0 0 0-20.672-49.856l-99.456-17.536-17.536-99.456a32 32 0 0 0-49.856-20.672L512 235.712l-82.72-57.92a32 32 0 0 0-49.856 20.672l-17.536 99.456-99.456 17.504a32 32 0 0 0-20.672 49.856L299.712 448l-57.92 82.72a32 32 0 0 0 20.672 49.856l99.456 17.536 17.536 99.456a32 32 0 0 0 49.856 20.672L512 660.288l82.72 57.92a32 32 0 0 0 49.856-20.672l17.536-99.456 99.456-17.536a31.968 31.968 0 0 0 20.64-49.824z m-123.2-64.352l41.952 59.904-72.032 12.704a32 32 0 0 0-25.952 25.952l-12.704 72.032-59.904-41.952a32 32 0 0 0-36.704 0l-59.904 41.952-12.704-72.032a32 32 0 0 0-25.952-25.952l-72.032-12.704 41.952-59.904a32 32 0 0 0 0-36.704l-41.952-59.904 72.032-12.704a32 32 0 0 0 25.952-25.952l12.704-72.032 59.904 41.952a32 32 0 0 0 36.704 0l59.904-41.952 12.704 72.032a32 32 0 0 0 25.952 25.952l72.032 12.704-41.952 59.904a32 32 0 0 0 0 36.704z' fill='{{(isStr ? colors : colors[0]) || 'rgb(241,137,0)'}}' /%3E%3Cpath d='M512 34.912c-243.008 0-440 196.992-440 440a438.72 438.72 0 0 0 133.344 315.552 32 32 0 1 0 44.608-45.888 374.752 374.752 0 0 1-113.952-269.664c0-207.648 168.352-376 376-376s376 168.352 376 376c0 99.136-38.496 192.096-106.144 261.824a32 32 0 1 0 45.92 44.576 438.56 438.56 0 0 0 124.224-306.4c0-243.008-196.992-440-440-440z' fill='{{(isStr ? colors : colors[1]) || 'rgb(241,137,0)'}}' /%3E%3Cpath d='M704 761.088a32 32 0 0 0-32 32v107.104l-142.24-94.848-0.064-0.032a32 32 0 0 0-11.552-4.736c-2.048-0.416-4.096-0.032-6.144-0.032s-4.096-0.352-6.144 0.032c-4.096 0.8-8 2.4-11.552 4.736l-0.064 0.032L352 900.224V800a32 32 0 0 0-64 0v160c0 0.992 0.48 1.856 0.576 2.848a32.256 32.256 0 0 0 3.712 12.224c0.48 0.864 0.544 1.856 1.088 2.688 0.576 0.896 1.504 1.344 2.176 2.144a31.36 31.36 0 0 0 21.472 11.488c1.024 0.096 1.92 0.608 2.976 0.608 0.992 0 1.856-0.48 2.848-0.576a32.256 32.256 0 0 0 12.256-3.712c0.864-0.48 1.856-0.544 2.688-1.088L512 870.464l174.24 116.16c14.688 9.792 34.56 5.824 44.384-8.864a31.584 31.584 0 0 0 4.768-21.664c0.096-1.056 0.608-1.952 0.608-3.04v-159.968a32 32 0 0 0-32-32z' fill='{{(isStr ? colors : colors[2]) || 'rgb(241,137,0)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />

<!--tiwen-->
<view wx:if="{{name === 'tiwen'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1025 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M513.343679 1023.99808a515.388457 515.388457 0 0 1-226.110445-52.41564l-166.910853 21.82385a78.719459 78.719459 0 0 1-69.567522-26.239819 78.911457 78.911457 0 0 1-18.87987-62.207573l21.82385-166.910852a510.268492 510.268492 0 0 1 97.407331-588.091957A508.668503 508.668503 0 0 1 513.15168 0.00512c136.831059 0 265.342176 53.247634 362.045511 149.950969C971.964526 246.659424 1025.21216 375.23454 1025.21216 512.0016s-53.247634 265.342176-150.014969 362.10951A508.412505 508.412505 0 0 1 513.343679 1023.99808z m-220.478484-117.439193c5.119965 0 10.11193 1.215992 14.655899 3.583976A451.004899 451.004899 0 0 0 513.343679 959.99852a444.796942 444.796942 0 0 0 316.605823-131.135098C914.556921 744.256003 961.2126 631.680777 961.2126 512.0016s-46.655679-232.190404-131.263098-316.797822S632.830858 64.00468 513.15168 64.00468s-232.190404 46.59168-316.797822 131.199098a446.52493 446.52493 0 0 0-81.215441 522.492408 31.99978 31.99978 0 0 1 3.263977 18.81587l-23.103841 176.702786a14.719899 14.719899 0 0 0 3.583976 11.775919c2.815981 3.263978 6.847953 5.119965 11.071923 5.119964l178.750772-23.23184a23.23184 23.23184 0 0 1 4.159971-0.319998z' fill='{{(isStr ? colors : colors[0]) || 'rgb(241,137,0)'}}' /%3E%3Cpath d='M513.791676 678.272457a31.99978 31.99978 0 0 1-31.99978-31.99978c0-55.23162 24.511831-108.735252 65.53555-143.039017 6.911952-5.75996 14.335901-11.58392 21.823849-17.40788 21.631851-16.895884 44.031697-34.303764 55.615618-54.463626 15.99989-27.839809 11.263923-67.967533-11.327922-95.551343-28.543804-34.87976-79.167456-38.591735-99.647315-38.591734-116.479199 0-121.471165 93.823355-121.663164 104.511281-0.319998 17.599879-16.639886 29.631796-32.319777 31.551783a31.871781 31.871781 0 0 1-31.679783-31.99978c0.191999-58.1116 39.29573-167.998845 185.662724-167.998845 62.52757 0 116.863197 22.591845 149.182974 62.015574 39.423729 48.06367 46.59168 117.183194 17.343881 167.998845-17.791878 30.975787-46.463681 53.311633-71.743507 73.087497a526.716379 526.716379 0 0 0-20.159861 15.935891 123.199153 123.199153 0 0 0-42.623707 93.951354 31.99978 31.99978 0 0 1-31.99978 31.99978zM542.591478 754.87993a32.255778 32.255778 0 0 1-42.495708 42.495708 30.015794 30.015794 0 0 1-16.319888-16.319888 32.255778 32.255778 0 0 1 42.495708-42.495708c7.29595 2.94398 13.439908 9.087938 16.319888 16.319888z' fill='{{(isStr ? colors : colors[1]) || 'rgb(241,137,0)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />

<!--comment-->
<view wx:if="{{name === 'comment'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M853.333333 138.666667H170.666667c-40.533333 0-74.666667 34.133333-74.666667 74.666666v512c0 40.533333 34.133333 74.666667 74.666667 74.666667h151.466666V917.333333c0 12.8 8.533333 25.6 19.2 29.866667 4.266667 2.133333 8.533333 2.133333 12.8 2.133333 8.533333 0 17.066667-4.266667 23.466667-10.666666l136.533333-138.666667H853.333333c40.533333 0 74.666667-34.133333 74.666667-74.666667V213.333333c0-40.533333-34.133333-74.666667-74.666667-74.666666z m10.666667 586.666666c0 6.4-4.266667 10.666667-10.666667 10.666667H501.333333c-8.533333 0-17.066667 4.266667-23.466666 10.666667l-89.6 93.866666V768c0-17.066667-14.933333-32-32-32H170.666667c-6.4 0-10.666667-4.266667-10.666667-10.666667V213.333333c0-6.4 4.266667-10.666667 10.666667-10.666666h682.666666c6.4 0 10.666667 4.266667 10.666667 10.666666v512z' fill='{{(isStr ? colors : colors[0]) || 'rgb(102,102,102)'}}' /%3E%3Cpath d='M512 490.666667H298.666667c-17.066667 0-32 14.933333-32 32S281.6 554.666667 298.666667 554.666667h213.333333c17.066667 0 32-14.933333 32-32S529.066667 490.666667 512 490.666667zM672 341.333333H298.666667c-17.066667 0-32 14.933333-32 32S281.6 405.333333 298.666667 405.333333h373.333333c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32z' fill='{{(isStr ? colors : colors[1]) || 'rgb(102,102,102)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />
<view wx:if="{{name === 'comment'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M853.333333 138.666667H170.666667c-40.533333 0-74.666667 34.133333-74.666667 74.666666v512c0 40.533333 34.133333 74.666667 74.666667 74.666667h151.466666V917.333333c0 12.8 8.533333 25.6 19.2 29.866667 4.266667 2.133333 8.533333 2.133333 12.8 2.133333 8.533333 0 17.066667-4.266667 23.466667-10.666666l136.533333-138.666667H853.333333c40.533333 0 74.666667-34.133333 74.666667-74.666667V213.333333c0-40.533333-34.133333-74.666667-74.666667-74.666666z m10.666667 586.666666c0 6.4-4.266667 10.666667-10.666667 10.666667H501.333333c-8.533333 0-17.066667 4.266667-23.466666 10.666667l-89.6 93.866666V768c0-17.066667-14.933333-32-32-32H170.666667c-6.4 0-10.666667-4.266667-10.666667-10.666667V213.333333c0-6.4 4.266667-10.666667 10.666667-10.666666h682.666666c6.4 0 10.666667 4.266667 10.666667 10.666666v512z' fill='{{(isStr ? colors : colors[0]) || 'rgb(241,137,0)'}}' /%3E%3Cpath d='M512 490.666667H298.666667c-17.066667 0-32 14.933333-32 32S281.6 554.666667 298.666667 554.666667h213.333333c17.066667 0 32-14.933333 32-32S529.066667 490.666667 512 490.666667zM672 341.333333H298.666667c-17.066667 0-32 14.933333-32 32S281.6 405.333333 298.666667 405.333333h373.333333c17.066667 0 32-14.933333 32-32s-14.933333-32-32-32z' fill='{{(isStr ? colors : colors[1]) || 'rgb(241,137,0)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />

<!--like-->
<view wx:if="{{name === 'like'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M885.9 533.7c16.8-22.2 26.1-49.4 26.1-77.7 0-44.9-25.1-87.4-65.5-111.1a67.67 67.67 0 0 0-34.3-9.3H572.4l6-122.9c1.4-29.7-9.1-57.9-29.5-79.4-20.5-21.5-48.1-33.4-77.9-33.4-52 0-98 35-111.8 85.1l-85.9 311H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h601.3c9.2 0 18.2-1.8 26.5-5.4 47.6-20.3 78.3-66.8 78.3-118.4 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7-0.2-12.6-2-25.1-5.6-37.1zM184 852V568h81v284h-81z m636.4-353l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 22.4-13.2 42.6-33.6 51.8H329V564.8l99.5-360.5c5.2-18.9 22.5-32.2 42.2-32.3 7.6 0 15.1 2.2 21.1 6.7 9.9 7.4 15.2 18.6 14.6 30.5l-9.6 198.4h314.4C829 418.5 840 436.9 840 456c0 16.5-7.2 32.1-19.6 43z' fill='{{(isStr ? colors : colors[0]) || 'rgb(51,51,51)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />
<view wx:if="{{name === 'like'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1024 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M885.9 533.7c16.8-22.2 26.1-49.4 26.1-77.7 0-44.9-25.1-87.4-65.5-111.1a67.67 67.67 0 0 0-34.3-9.3H572.4l6-122.9c1.4-29.7-9.1-57.9-29.5-79.4-20.5-21.5-48.1-33.4-77.9-33.4-52 0-98 35-111.8 85.1l-85.9 311H144c-17.7 0-32 14.3-32 32v364c0 17.7 14.3 32 32 32h601.3c9.2 0 18.2-1.8 26.5-5.4 47.6-20.3 78.3-66.8 78.3-118.4 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7 0-12.6-1.8-25-5.4-37 16.8-22.2 26.1-49.4 26.1-77.7-0.2-12.6-2-25.1-5.6-37.1zM184 852V568h81v284h-81z m636.4-353l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 16.5-7.2 32.2-19.6 43l-21.9 19 13.9 25.4c4.6 8.4 6.9 17.6 6.9 27.3 0 22.4-13.2 42.6-33.6 51.8H329V564.8l99.5-360.5c5.2-18.9 22.5-32.2 42.2-32.3 7.6 0 15.1 2.2 21.1 6.7 9.9 7.4 15.2 18.6 14.6 30.5l-9.6 198.4h314.4C829 418.5 840 436.9 840 456c0 16.5-7.2 32.1-19.6 43z' fill='{{(isStr ? colors : colors[0]) || 'rgb(241,137,0)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />

<!--wechat-->
<view wx:if="{{name === 'wechat'}}" style="background-image: url({{quot}}data:image/svg+xml, %3Csvg viewBox='0 0 1025 1024' xmlns='http://www.w3.org/2000/svg' width='{{svgSize}}px' height='{{svgSize}}px'%3E%3Cpath d='M1016.32 570.88c-30.72-110.08-112.64-179.2-240.64-207.36-28.16-5.12-40.96-12.8-46.08-38.4-2.56-20.48-15.36-38.4-25.6-53.76-69.12-110.08-179.2-168.96-320-176.64l0 0c-102.4 2.56-179.2 23.04-243.2 69.12-110.08 79.36-153.6 179.2-133.12 299.52 12.8 66.56 48.64 122.88 115.2 176.64 12.8 10.24 15.36 17.92 10.24 30.72-7.68 20.48-15.36 40.96-20.48 66.56-2.56 7.68 0 20.48 5.12 28.16 5.12 5.12 20.48 0 25.6 0C153.6 755.2 166.4 750.08 181.76 742.4c15.36-7.68 33.28-17.92 51.2-25.6 7.68-2.56 20.48-5.12 30.72-5.12 53.76 2.56 97.28 5.12 138.24 10.24 5.12 0 12.8 7.68 17.92 12.8 56.32 112.64 186.88 179.2 314.88 161.28 66.56-10.24 110.08 0 153.6 28.16 5.12 5.12 12.8 5.12 20.48 5.12 2.56 0 7.68 0 10.24 0l5.12 0 0-5.12c0-2.56 0-5.12 0-7.68 0-7.68 2.56-15.36 0-20.48-20.48-40.96-12.8-69.12 25.6-102.4C1013.76 732.16 1039.36 652.8 1016.32 570.88zM166.4 691.2c2.56-10.24 5.12-20.48 10.24-30.72 10.24-20.48 5.12-35.84-15.36-51.2-58.88-43.52-92.16-89.6-104.96-148.48-23.04-102.4 12.8-189.44 104.96-256 58.88-43.52 133.12-64 204.8-64 104.96 0 212.48 43.52 276.48 125.44 12.8 17.92 23.04 38.4 35.84 61.44 5.12 7.68 7.68 17.92 12.8 28.16-107.52 7.68-194.56 51.2-248.32 122.88-43.52 56.32-58.88 128-43.52 199.68-7.68 0-15.36 0-25.6 0-23.04 0-43.52 0-61.44-5.12C261.12 660.48 222.72 665.6 186.88 691.2c-5.12 2.56-10.24 5.12-17.92 7.68-2.56 0-2.56 2.56-5.12 2.56C163.84 698.88 166.4 693.76 166.4 691.2zM931.84 734.72c-17.92 23.04-35.84 40.96-51.2 53.76-23.04 17.92-28.16 35.84-17.92 61.44 2.56 2.56 2.56 7.68 2.56 10.24 0 2.56 0 2.56 0 5.12l0 0c-20.48-20.48-43.52-25.6-64-25.6-15.36 0-28.16 2.56-43.52 5.12-7.68 0-15.36 2.56-20.48 2.56-102.4 12.8-189.44-23.04-250.88-99.84-64-79.36-56.32-192 23.04-266.24 53.76-51.2 133.12-79.36 212.48-76.8 79.36 5.12 153.6 38.4 204.8 97.28C983.04 570.88 988.16 663.04 931.84 734.72z' fill='{{(isStr ? colors : colors[0]) || 'rgb(51,51,51)'}}' /%3E%3Cpath d='M248.32 304.64m-43.52 0a1.7 1.7 0 1 0 87.04 0 1.7 1.7 0 1 0-87.04 0Z' fill='{{(isStr ? colors : colors[1]) || 'rgb(51,51,51)'}}' /%3E%3Cpath d='M499.2 304.64m-43.52 0a1.7 1.7 0 1 0 87.04 0 1.7 1.7 0 1 0-87.04 0Z' fill='{{(isStr ? colors : colors[2]) || 'rgb(51,51,51)'}}' /%3E%3Cpath d='M611.84 550.4m-33.28 0a1.3 1.3 0 1 0 66.56 0 1.3 1.3 0 1 0-66.56 0Z' fill='{{(isStr ? colors : colors[3]) || 'rgb(51,51,51)'}}' /%3E%3Cpath d='M808.96 550.4m-33.28 0a1.3 1.3 0 1 0 66.56 0 1.3 1.3 0 1 0-66.56 0Z' fill='{{(isStr ? colors : colors[4]) || 'rgb(51,51,51)'}}' /%3E%3C/svg%3E{{quot}}); width: {{svgSize}}px; height: {{svgSize}}px; " class="icon" />
Expand Down
1 change: 0 additions & 1 deletion src/modules/login/components/Popper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ const Content: React.FC<{ onClose: () => void }> = memo(({ onClose }) => (
<View className="relative mb-4 flex w-full items-center justify-center">
<Text
className="absolute right-0 m-1 border-none bg-transparent p-2 text-2xl font-bold text-gray-500 focus:outline-none"
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
onClick={onClose}
>
x
Expand Down
Loading

0 comments on commit 011d9f9

Please sign in to comment.