Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitb002eef

Browse files
committed
Fix navicon
1 parentc566d5d commitb002eef

File tree

7 files changed

+139
-135
lines changed

7 files changed

+139
-135
lines changed

‎assets/bindata.go‎

Lines changed: 111 additions & 111 deletions
Some generated files are not rendered by default. Learn more aboutcustomizing how changed files appear on GitHub.

‎client/css/style.css‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,7 @@ input::-webkit-inner-spin-button {
479479

480480
.navicon {
481481
display: none;
482-
padding:015px;
483-
line-height:50px;
484-
font-size:20px;
482+
width:50px;
485483
cursor: pointer;
486484
}
487485

@@ -495,7 +493,7 @@ input::-webkit-inner-spin-button {
495493
display: none;
496494
}
497495

498-
.chat-title-bar .icon-button {
496+
.chat-title-bar .icon-button:not(.navicon) {
499497
color:#999;
500498
}
501499

@@ -808,7 +806,7 @@ input.message-input-nick.invalid {
808806
color:#222;
809807
}
810808

811-
.settingsbutton {
809+
.settings-button {
812810
width:200px;
813811
}
814812

@@ -852,8 +850,8 @@ input.message-input-nick.invalid {
852850
margin-right:0;
853851
}
854852

855-
.settings-button {
856-
margin-top:10px;
853+
.settings-file:last-of-type {
854+
margin-bottom:10px;
857855
}
858856
}
859857

@@ -1059,7 +1057,7 @@ input.message-input-nick.invalid {
10591057
}
10601058

10611059
.navicon {
1062-
display:inline-block;
1060+
display: block;
10631061
}
10641062

10651063
.main-container.off-canvas {

‎client/js/components/pages/Chat/ChatTitle.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
importReact,{memo}from'react';
22
import{FiUsers,FiSearch,FiX}from'react-icons/fi';
3-
importNaviconfrom'containers/Navicon';
3+
importNaviconfrom'components/ui/Navicon';
44
importButtonfrom'components/ui/Button';
55
importEditablefrom'components/ui/Editable';
66
import{isValidServerName}from'state/servers';

‎client/js/components/pages/Connect.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
importReact,{Component}from'react';
22
import{createSelector}from'reselect';
33
import{Form,withFormik}from'formik';
4-
importNaviconfrom'containers/Navicon';
4+
importNaviconfrom'components/ui/Navicon';
55
importButtonfrom'components/ui/Button';
66
importCheckboxfrom'components/ui/formik/Checkbox';
77
importTextInputfrom'components/ui/TextInput';

‎client/js/components/pages/Settings.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
importReact,{useCallback}from'react';
2-
importNaviconfrom'containers/Navicon';
2+
importNaviconfrom'components/ui/Navicon';
33
importButtonfrom'components/ui/Button';
44
importCheckboxfrom'components/ui/Checkbox';
55
importFileInputfrom'components/ui/FileInput';
@@ -29,7 +29,10 @@ const Settings = ({
2929
<Navicon/>
3030
<h1>Settings</h1>
3131
{installable&&(
32-
<ButtonclassName="button-install"onClick={handleInstallClick}>
32+
<Button
33+
className="settings-button button-install"
34+
onClick={handleInstallClick}
35+
>
3336
<h2>Install</h2>
3437
</Button>
3538
)}

‎client/js/components/ui/Navicon.js‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
importReactfrom'react';
2+
import{FiMenu}from'react-icons/fi';
3+
import{useDispatch}from'react-redux';
4+
importButtonfrom'components/ui/Button';
5+
import{toggleMenu}from'state/ui';
26

3-
constNavicon=({ onClick})=>(
4-
<iclassName="icon-menu navicon"onClick={onClick}/>
5-
);
7+
constNavicon=()=>{
8+
constdispatch=useDispatch();
9+
10+
return(
11+
<Button
12+
className="navicon"
13+
icon={FiMenu}
14+
onClick={()=>dispatch(toggleMenu())}
15+
/>
16+
);
17+
};
618

719
exportdefaultNavicon;

‎client/js/containers/Navicon.js‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp