Personal_mirrors/bitburner-src
1
0
Fork 0
mirror of https://github.com/bitburner-official/bitburner-src.git synced 2024-12-18 12:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix faction scrolling

Browse Source
This commit is contained in:
Olivier Gagnon 2021-09-11 23:29:04 -04:00
parent 1a5651ae8b
commit a9c80f0691
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
css/menupages.scss
View File

@ -43,11 +43,6 @@
padding-top: 10px; padding-top: 10px;
} }
#faction-container {
position: fixed;
padding-top: 10px;
}
.faction-work-div { .faction-work-div {
width: 70%; width: 70%;
height: 100%; height: 100%;
@ -61,13 +56,13 @@
width: 70%; width: 70%;
} }
#faction-container p, .faction-container p,
#faction-container pre { .faction-container pre {
padding: 4px 6px; padding: 4px 6px;
margin: 4px 6px; margin: 4px 6px;
} }
#faction-container pre { .faction-container pre {
width: 70%; width: 70%;
white-space: pre-wrap; /* Since CSS 2.1 */ white-space: pre-wrap; /* Since CSS 2.1 */
white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ white-space: -moz-pre-wrap; /* Mozilla, since 1999 */

2
dist/engine.bundle.js vendored
View File

File diff suppressed because one or more lines are too long

10
dist/engineStyle.css vendored
View File

@ -1672,10 +1672,6 @@ button {
position: fixed; position: fixed;
padding-top: 10px; } padding-top: 10px; }
#faction-container {
position: fixed;
padding-top: 10px; }
.faction-work-div { .faction-work-div {
width: 70%; width: 70%;
height: 100%; } height: 100%; }
@ -1687,12 +1683,12 @@ button {
margin: 6px; margin: 6px;
width: 70%; } width: 70%; }
#faction-container p, .faction-container p,
#faction-container pre { .faction-container pre {
padding: 4px 6px; padding: 4px 6px;
margin: 4px 6px; } margin: 4px 6px; }
#faction-container pre { .faction-container pre {
width: 70%; width: 70%;
white-space: pre-wrap; white-space: pre-wrap;
/* Since CSS 2.1 */ /* Since CSS 2.1 */

4
src/Faction/ui/Root.tsx
View File

@ -103,7 +103,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
popupId: popupId, popupId: popupId,
facName: this.props.faction.name, facName: this.props.faction.name,
p: this.props.p, p: this.props.p,
engine: this.props.engine engine: this.props.engine,
}); });
} }
@ -178,7 +178,7 @@ export class FactionRoot extends React.Component<IProps, IState> {
} }
return ( return (
<div id="faction-container"> <div className="faction-container">
<h1>{faction.name}</h1> <h1>{faction.name}</h1>
<Info faction={faction} factionInfo={factionInfo} /> <Info faction={faction} factionInfo={factionInfo} />
{canAccessGang && <Option buttonText={"Manage Gang"} infoText={gangInfo} onClick={this.manageGang} />} {canAccessGang && <Option buttonText={"Manage Gang"} infoText={gangInfo} onClick={this.manageGang} />}