Skip to content

Commit 7e2bcf6

Browse files
committed
bitshares#1580 Integrate bitshares-ui-style-guide
1 parent 99867a6 commit 7e2bcf6

File tree

3 files changed

+29
-24
lines changed

3 files changed

+29
-24
lines changed

app/App.jsx

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import Incognito from "./components/Layout/Incognito";
2626
import {isIncognito} from "feature_detect";
2727
import {updateGatewayBackers} from "common/gatewayUtils";
2828
import titleUtils from "common/titleUtils";
29+
import {BodyClassName} from "bitshares-ui-style-guide";
2930
import PropTypes from "prop-types";
3031

3132
class App extends React.Component {
@@ -258,31 +259,33 @@ class App extends React.Component {
258259
style={{backgroundColor: !this.state.theme ? "#2a2a2a" : null}}
259260
className={this.state.theme}
260261
>
261-
{walletMode && incognito && !incognitoWarningDismissed ? (
262-
<Incognito
263-
onClickIgnore={this._onIgnoreIncognitoWarning.bind(
264-
this
265-
)}
266-
/>
267-
) : null}
268-
<div id="content-wrapper">
269-
{content}
270-
<NotificationSystem
271-
ref="notificationSystem"
272-
allowHTML={true}
273-
style={{
274-
Containers: {
275-
DefaultStyle: {
276-
width: "425px"
262+
<BodyClassName className={this.state.theme}>
263+
{walletMode && incognito && !incognitoWarningDismissed ? (
264+
<Incognito
265+
onClickIgnore={this._onIgnoreIncognitoWarning.bind(
266+
this
267+
)}
268+
/>
269+
) : null}
270+
<div id="content-wrapper">
271+
{content}
272+
<NotificationSystem
273+
ref="notificationSystem"
274+
allowHTML={true}
275+
style={{
276+
Containers: {
277+
DefaultStyle: {
278+
width: "425px"
279+
}
277280
}
278-
}
279-
}}
280-
/>
281-
<TransactionConfirm />
282-
<BrowserNotifications />
283-
<WalletUnlockModal />
284-
<BrowserSupportModal ref="browser_modal" />
285-
</div>
281+
}}
282+
/>
283+
<TransactionConfirm />
284+
<BrowserNotifications />
285+
<WalletUnlockModal />
286+
<BrowserSupportModal ref="browser_modal" />
287+
</div>
288+
</BodyClassName>
286289
</div>
287290
);
288291
}

app/assets/stylesheets/vendors/_all.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@
77
@import "introjs-midnight-theme";
88
@import "~react-datepicker2/dist/react-datepicker2.css";
99
@import "~react-sticky-table/dist/react-sticky-table.css";
10+
@import "~bitshares-ui-style-guide/dist/styles/style.css";

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
"alt-container": "^1.0.0",
133133
"alt-react": "git+https://github.com/bitshares/react.git",
134134
"bignumber.js": "^4.0.0",
135+
"bitshares-ui-style-guide": "git+ssh://[email protected]/bitshares/bitshares-ui-style-guide.git",
135136
"bitsharesjs": "^1.7.6",
136137
"browser-locale": "^1.0.3",
137138
"classnames": "^2.2.1",

0 commit comments

Comments
 (0)