Skip to content

refactor(style): refactor icon style and text tip #2026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2023
Merged

refactor(style): refactor icon style and text tip #2026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions packages/flat-components/src/components/LoginPage/LoginButton/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,32 +24,38 @@

&-agora {
background: #089cfd;
transition: background-color 0.3s ease-in-out;

&:hover {
background: #45b4fd;
}

&:active {
background: #0675be;
}
}

&-wechat {
background: #1aad19;
transition: background-color 0.3s ease-in-out;

&:hover {
background: #50c050;
}

&:active {
background: #138212;
}
}

&-github {
background: #24292e;
transition: background-color 0.3s ease-in-out;

&:hover {
background: #595d60;
}

&:active {
background: #1b1f22;
}
Expand All @@ -58,12 +64,14 @@
&-google {
background: #fff;
border: 1px solid rgba(0, 0, 0, 0.15);
transition: border 0.3s ease-in-out;

&:hover {
border: 1px solid rgba(0, 0, 0, 0.5);
border: 1px solid rgba(0, 0, 0, 0.3);
}

&:active {
border: 1px solid rgba(0, 0, 0, 0.75);
border: 1px solid rgba(0, 0, 0, 0.5);
}
}
}
}
4 changes: 2 additions & 2 deletions packages/flat-components/src/components/LoginPage/LoginButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const svgDict: Record<LoginButtonProviderType, string> = {
google: googleSVG,
};

export const LoginButton: React.FC<LoginButtonProps> = ({ provider, text, onClick }) => {
export const LoginButton: React.FC<LoginButtonProps> = ({ provider, onClick }) => {
return (
<div className="login-button-wrapper">
<button
Expand All @@ -30,7 +30,7 @@ export const LoginButton: React.FC<LoginButtonProps> = ({ provider, text, onClic
>
<img alt={provider} src={svgDict[provider]} />
</button>
<span className="login-button-text">{text || provider}</span>
{/* <span className="login-button-text">{text || provider}</span> */}
</div>
);
};
2 changes: 1 addition & 1 deletion packages/flat-components/src/components/MainPageLayout/MainPageSubMenu/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export const MainPageSubMenu: React.FC<MainPageSubMenuProps> = ({
activeKeys,
}) => {
return (
<div className="main-layout-sub-menu">
<div className={classNames("main-layout-sub-menu", !window.isElectron && "br-tl-bl-6")}>
<ul>
{subMenu.map(menuItem => (
<MainPageSubMenuItem
Expand Down
8 changes: 8 additions & 0 deletions packages/flat-components/src/components/MainPageLayout/MainPageSubMenu/style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,14 @@
}
}

// br-tl-bl-6: border-radius top-left bottom-left 6px
.main-layout-sub-menu.br-tl-bl-6 {
overflow: hidden;
border-radius: none;
border-top-left-radius: 6px;
border-bottom-left-radius: 6px;
}

.main-layout-sub-menu-item-icon {
width: 24px;
height: 24px;
Expand Down
4 changes: 4 additions & 0 deletions packages/flat-components/typings/global.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
interface Window {
isElectron?: boolean;
}

declare module "*.svg" {
const src: string;
export default src;
Expand Down
20 changes: 10 additions & 10 deletions packages/flat-i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,16 +405,16 @@
"send-verify-code": "Send code",
"incorrect-code": "Incorrect verification code",
"has-reset-password": "Your password has been reset",
"enter-code": "Please enter verification code",
"enter-email": "Please enter your email account",
"enter-email-or-phone": "Please enter your email account or phone number",
"pwd-login": "login with password",
"verify-code-login": "login with verification code",
"enter-password": "Please enter password",
"enter-new-password": "Please enter new password",
"enter-new-password-again": "Please enter new password again",
"enter-old-password": "Please enter old password",
"enter-phone": "Please enter phone number",
"enter-code": "Enter verification code",
"enter-email": "Enter email account",
"enter-email-or-phone": "Email or phone number",
"pwd-login": "via Password",
"verify-code-login": "via SMS",
"enter-password": "Enter password",
"enter-new-password": "Enter new password",
"enter-new-password-again": "Enter new password again",
"enter-old-password": "Enter old password",
"enter-phone": "Enter phone number",
"enter-phone-invalid": "Please enter valid phone number",
"enter-email-invalid": "Please enter valid email address",
"forgot": "Forgot?",
Expand Down
2 changes: 1 addition & 1 deletion packages/flat-pages/src/UserSettingPage/GeneralSettingPage/binding/icons/GoogleSVG.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function GoogleSVG({ color }: { color: string | undefined }): React.React
cy="12"
fill="#fff"
r="11.75"
stroke="#5d6066"
stroke="#b7bbc1"
strokeWidth="0.5"
/>
{path.map((item, index) => (
Expand Down