Merge pull request !9 from Riceneeder/dev;
v1.2.3 增添darkmode,调整优化界面、颜色,以适应darkmode
This commit is contained in:
Riceneeder 2022-09-03 02:48:28 +00:00 committed by Gitee
commit 8cc58d9e68
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
12 changed files with 40 additions and 18 deletions

View File

@ -214,7 +214,12 @@ let mainMenu = [
type: 'separator', type: 'separator',
}, },
{ {
label: '' label: 'Darkmode',
accelerator: !isOsx ? 'Ctrl+Shift+D' : 'Shift+Cmd+D',
click() {
mainWindow.show();
mainWindow.webContents.send('darkmode');
}
}, },
{ {
type: 'separator', type: 'separator',

View File

@ -1,6 +1,6 @@
{ {
"name": "wewechat", "name": "wewechat",
"version": "1.2.2", "version": "1.2.3",
"description": "make weweChat great again!!!", "description": "make weweChat great again!!!",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
@ -23,7 +23,7 @@
"author": { "author": {
"email": "845541909@qq.com" "email": "845541909@qq.com"
}, },
"homepage": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus/README.md", "homepage": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus/README.md",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus" "url": "https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
@ -86,6 +86,7 @@
"axios": "^0.18.0", "axios": "^0.18.0",
"browser-md5-file": "^1.0.0", "browser-md5-file": "^1.0.0",
"classname": "^0.0.0", "classname": "^0.0.0",
"darkmode-js": "^1.5.7",
"delegate": "^3.1.3", "delegate": "^3.1.3",
"electron-context-menu": "^0.10.0", "electron-context-menu": "^0.10.0",
"electron-json-storage": "^4.0.2", "electron-json-storage": "^4.0.2",

View File

@ -4,6 +4,7 @@ import { render } from 'react-dom';
import { Provider } from 'mobx-react'; import { Provider } from 'mobx-react';
import { HashRouter } from 'react-router-dom'; import { HashRouter } from 'react-router-dom';
import { ipcRenderer } from 'electron'; import { ipcRenderer } from 'electron';
import Darkmode from 'darkmode-js';
import './global.css'; import './global.css';
import './assets/fonts/icomoon/style.css'; import './assets/fonts/icomoon/style.css';
@ -27,6 +28,11 @@ class App extends Component {
componentDidMount() { componentDidMount() {
var navigator = this.refs.navigator; var navigator = this.refs.navigator;
const options = {
time: '0.5s',
mixColor: '#cccccc',
};
const darkmode = new Darkmode(options);
// Hide the tray icon // Hide the tray icon
ipcRenderer.on('hide-tray', () => { ipcRenderer.on('hide-tray', () => {
@ -130,6 +136,11 @@ class App extends Component {
ipcRenderer.on('show-errors', (event, args) => { ipcRenderer.on('show-errors', (event, args) => {
stores.snackbar.showMessage(args.message); stores.snackbar.showMessage(args.message);
}); });
// Dark mode
ipcRenderer.on('darkmode', () => {
darkmode.toggle();
});
} }
render() { render() {

View File

@ -14,7 +14,7 @@
border: 0; border: 0;
padding-right: 17px; padding-right: 17px;
background: 0; background: 0;
color: #333; color: #808080;
font-size: 14px; font-size: 14px;
outline: 0; outline: 0;
} }

View File

@ -19,8 +19,8 @@ export default class Placeholder extends Component {
className={classes.button} className={classes.button}
href="https://gitee.com/spark-community-works-collections/wewechat-plus-plus" href="https://gitee.com/spark-community-works-collections/wewechat-plus-plus"
target="_blank"> target="_blank">
Fork on Github Fork on Gitee
<i className="icon-ion-social-github" /> <i className="icon-ion-fork-repo" />
</a> </a>
</div> </div>
); );

View File

@ -7,7 +7,6 @@
.footer { .footer {
position: relative; position: relative;
background: #fff;
box-shadow: inset 0 1px 0 0 var(--shadow-color); box-shadow: inset 0 1px 0 0 var(--shadow-color);
z-index: 9; z-index: 9;
@ -78,7 +77,7 @@
line-height: 60px; line-height: 60px;
border: 0; border: 0;
background: 0; background: 0;
color: #333; color: #808080;
font-size: 14px; font-size: 14px;
outline: 0; outline: 0;
} }
@ -107,7 +106,7 @@
position: relative; position: relative;
margin-right: 17px; margin-right: 17px;
width: 166px; width: 166px;
color: rgba(0, 0, 0, .8); color: #808080;
font-size: 14px; font-size: 14px;
padding: 9px 8px; padding: 9px 8px;
font-family: 'Roboto'; font-family: 'Roboto';

View File

@ -8,7 +8,7 @@
font-family: "system-ui"; font-family: "system-ui";
font-weight: normal; font-weight: normal;
width: 100%; width: 100%;
color: #777; color: #c3c3c3;
text-align: center; text-align: center;
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
-webkit-user-select: none; -webkit-user-select: none;

View File

@ -114,7 +114,7 @@
width: 32px; width: 32px;
border-radius: 0; border-radius: 0;
z-index: 9; z-index: 9;
box-shadow: 0 0 10px 0 rgba(0, 0, 0, .5); box-shadow: 0 0 10px 0 rgba(225, 225, 225, 0.5);
cursor: pointer; cursor: pointer;
} }
@ -165,7 +165,7 @@
& .content { & .content {
position: relative; position: relative;
max-width: 100%; max-width: 100%;
background: #fff; background: rgba(225, 225, 225, 0.5);
box-shadow: 0 6px 28px 0 rgba(230, 230, 230, 100); box-shadow: 0 6px 28px 0 rgba(230, 230, 230, 100);
} }
@ -538,7 +538,7 @@
} }
& .content { & .content {
background: #7ebef8; background: rgba(0, 0, 200, 0.5);
} }
& p { & p {

View File

@ -3,7 +3,6 @@
height: calc(100vh - 100px); height: calc(100vh - 100px);
overflow: hidden; overflow: hidden;
overflow-y: auto; overflow-y: auto;
background: rgba(255, 255, 255, .8);
box-shadow: inset 0 1px 0 0 #eaedea; box-shadow: inset 0 1px 0 0 #eaedea;
filter: blur(0); filter: blur(0);
transition: .2s; transition: .2s;

View File

@ -1,6 +1,6 @@
.container { .container {
background: #fff; background: rgba(142, 142, 142, 0.6);
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;
display: flex; display: flex;

View File

@ -172,7 +172,14 @@ export default class Settings extends Component {
</ul> </ul>
</div> </div>
<div className={classes.column}> <div className={classes.column}>
<h2>TODO:</h2> <h2>更新记录:</h2>
<p>
v1.2.3 增添darkmode调整优化界面颜色以适应darkmode<br />
v1.2.2 添加单例运行在后台时在启动器中启动会拉到前台而不是再启动一个wewechat更多的汉化<br />
v1.2.1 汉化<br />
v1.2.0 Make weweChat great again!!! Fix uos support
</p>
</div> </div>
</div> </div>
); );

View File

@ -4,7 +4,7 @@
justify-content: space-between; justify-content: space-between;
padding: 12px 17px 0; padding: 12px 17px 0;
font-family: 'Helvetica Neue'; font-family: 'Helvetica Neue';
color: #000; color: #808080;
& h2 { & h2 {
font-weight: 300; font-weight: 300;