Skip to content

Commit abb5339

Browse files
committed
Merge branch 'staging' of https://github.com/gibbsfromncis/bitshares-ui into gibbsfromncis-staging
2 parents bf6331d + 500c3aa commit abb5339

File tree

5 files changed

+1059
-37
lines changed

5 files changed

+1059
-37
lines changed

app/App.jsx

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import Incognito from "./components/Layout/Incognito";
1818
import {isIncognito} from "feature_detect";
1919
import {updateGatewayBackers} from "common/gatewayUtils";
2020
import titleUtils from "common/titleUtils";
21+
import {BodyClassName} from "bitshares-ui-style-guide";
2122
import Loadable from "react-loadable";
2223

2324
import {Route, Switch} from "react-router-dom";
@@ -411,31 +412,33 @@ class App extends React.Component {
411412
style={{backgroundColor: !theme ? "#2a2a2a" : null}}
412413
className={theme}
413414
>
414-
{walletMode && incognito && !incognitoWarningDismissed ? (
415-
<Incognito
416-
onClickIgnore={this._onIgnoreIncognitoWarning.bind(
417-
this
418-
)}
419-
/>
420-
) : null}
421-
<div id="content-wrapper">
422-
{content}
423-
<NotificationSystem
424-
ref="notificationSystem"
425-
allowHTML={true}
426-
style={{
427-
Containers: {
428-
DefaultStyle: {
429-
width: "425px"
415+
<BodyClassName className={theme}>
416+
{walletMode && incognito && !incognitoWarningDismissed ? (
417+
<Incognito
418+
onClickIgnore={this._onIgnoreIncognitoWarning.bind(
419+
this
420+
)}
421+
/>
422+
) : null}
423+
<div id="content-wrapper">
424+
{content}
425+
<NotificationSystem
426+
ref="notificationSystem"
427+
allowHTML={true}
428+
style={{
429+
Containers: {
430+
DefaultStyle: {
431+
width: "425px"
432+
}
430433
}
431-
}
432-
}}
433-
/>
434-
<TransactionConfirm />
435-
<BrowserNotifications />
436-
<WalletUnlockModal />
437-
<BrowserSupportModal ref="browser_modal" />
438-
</div>
434+
}}
435+
/>
436+
<TransactionConfirm />
437+
<BrowserNotifications />
438+
<WalletUnlockModal />
439+
<BrowserSupportModal ref="browser_modal" />
440+
</div>
441+
</BodyClassName>
439442
</div>
440443
);
441444
}

app/assets/index.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<meta name="viewport" content="width=device-width"/>
99
<meta name="format-detection" content="telephone=no">
1010
<title>{{title}}</title>
11-
<meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data:; img-src 'self' data:;">
11+
<meta http-equiv="Content-Security-Policy" content="default-src 'self' blob:; worker-src 'self' blob:; script-src https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/ 'self' 'unsafe-eval' 'unsafe-inline'; style-src 'self' 'unsafe-inline'; connect-src 'self' *; font-src 'self' data: https://at.alicdn.com; img-src 'self' data:;">
1212
<link rel="icon" type="image/x-icon" href="favicon.ico">
1313
<style>
1414
body {

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";

0 commit comments

Comments
 (0)