diff --git a/package.json b/package.json
index f28c365..dd7cf1d 100644
--- a/package.json
+++ b/package.json
@@ -49,8 +49,7 @@
"node-sass": "^4.10.0",
"sass-loader": "^7.0.x",
"style-loader": "^0.23.1",
- "webpack": "^3.11",
- "webpack-cli": "^2.0.x",
- "webpack-dev-server": "^2.11.1"
+ "webpack": "^3.12.0",
+ "webpack-dev-server": "^2.11.3"
}
}
diff --git a/src/components/portal/Category.js b/src/components/portal/Category.js
index 77c8e88..d61b800 100644
--- a/src/components/portal/Category.js
+++ b/src/components/portal/Category.js
@@ -73,7 +73,6 @@ export default class Category extends React.Component {
:
this.props.type
);
- console.log(this.props.match);
top_content = ((tribe) ?
()
:
@@ -88,7 +87,6 @@ export default class Category extends React.Component {
cat_title = this.props.type;
top_content = ();
}
- console.log(top_content);
return (
{top_content}
diff --git a/src/components/portal/Single/Attack.js b/src/components/portal/Single/Attack.js
index cf875eb..d5b1e44 100644
--- a/src/components/portal/Single/Attack.js
+++ b/src/components/portal/Single/Attack.js
@@ -5,6 +5,7 @@ import API from '../../SpreadsheetData';
import s from '../../../styles/app.style';
import {observer, inject} from 'mobx-react';
import {PageNotFound} from '../../Snippets';
+import Single from './_base';
@inject((stores, props, context) => props) @observer
export default class SingleAttack extends React.Component {
@@ -28,41 +29,42 @@ export default class SingleAttack extends React.Component {
const card_data = API.cards.attacks.findOne({'gsx$name': name});
- return (
-
-

-
{attack.gsx$name}
-
-
- Attributes:
- {attack.gsx$attributes}
-
-
-
- Background:
- {attack.gsx$background}
-
-
-
- Details:
- {attack.gsx$details}
-
-
-
- Card ID:
- {card_data.gsx$id}
-
-
-
- Set:
- {card_data.gsx$set}
-
-
-
- Rarity:
- {card_data.gsx$rarity}
-
-
+ return (
+ {attack.gsx$name}
+
+
+ Attributes:
+ {attack.gsx$attributes}
+
+
+
+ Background:
+ {attack.gsx$background}
+
+
+
+ Details:
+ {attack.gsx$details}
+
+
+
+ Card ID:
+ {card_data.gsx$id}
+
+
+
+ Set:
+ {card_data.gsx$set}
+
+
+
+ Rarity:
+ {card_data.gsx$rarity}
+
+ }
+ />
);
}
}
diff --git a/src/components/portal/Single/Battlegear.js b/src/components/portal/Single/Battlegear.js
index 2384191..bfb53e8 100644
--- a/src/components/portal/Single/Battlegear.js
+++ b/src/components/portal/Single/Battlegear.js
@@ -29,10 +29,9 @@ export default class SingleBattlegear extends React.Component {
const card_data = API.cards.battlegear.findOne({'gsx$name': name});
- return (
-
-
-
+ return (
+
+
{path[2]}
+
{bottom_nav}
);
}
}
diff --git a/src/components/portal/index.js b/src/components/portal/index.js
index 38a6f03..b02cb23 100644
--- a/src/components/portal/index.js
+++ b/src/components/portal/index.js
@@ -26,7 +26,6 @@ export default class Base extends React.Component {
return (
-
);
diff --git a/src/scss/portal.scss b/src/scss/portal.scss
index f357b09..b8fb399 100644
--- a/src/scss/portal.scss
+++ b/src/scss/portal.scss
@@ -1,8 +1,3 @@
-.splash {
- max-width: 100%;
- padding-bottom: 10px;
-}
-
.navbar h1 {
font-size: 16px;
}
@@ -114,26 +109,43 @@
min-height: 600px;
height: calc(100vh - 200px);
overflow-y: scroll;
+ width: 100%;
+ // position: absolute;
+ // width: 100%;
- /* width */
- ::-webkit-scrollbar {
- width: 10px;
+ .splash {
+ padding-bottom: 4px;
+ img {
+ max-width: 100%;
+ }
+ // position: relative;
+ // z-index: -1;
}
- /* Track */
- ::-webkit-scrollbar-track {
- background: #f1f1f1;
+ .entry_text {
+ position: relative;
+ max-width: 100%;
}
- /* Handle */
- ::-webkit-scrollbar-thumb {
- background: #888;
- }
+ // /* width */
+ // ::-webkit-scrollbar {
+ // width: 10px;
+ // }
- /* Handle on hover */
- ::-webkit-scrollbar-thumb:hover {
- background: #555;
- }
+ // /* Track */
+ // ::-webkit-scrollbar-track {
+ // background: #f1f1f1;
+ // }
+
+ // /* Handle */
+ // ::-webkit-scrollbar-thumb {
+ // background: #888;
+ // }
+
+ // /* Handle on hover */
+ // ::-webkit-scrollbar-thumb:hover {
+ // background: #555;
+ // }
}
.cat_title {