Merge pull request #70 from RaenonX-DL/dev

v1.7.4 Release
RaenonX-DL · Jan 26, 2021 · a1c302a · a1c302a
2 parents 207b5f4 + 2c35f34
commit a1c302a
Show file tree

Hide file tree

Showing 9 changed files with 244 additions and 326 deletions.
diff --git a/src/bootstrap.css b/src/bootstrap.css
diff --git a/src/bootstrap.css.map b/src/bootstrap.css.map
diff --git a/src/components/elements/gameData/common/element.css b/src/components/elements/gameData/common/element.css
@@ -0,0 +1,5 @@
+/* Override the entry button behavior */
+
+div.btn-group-toggle > label.btn-outline-secondary:hover {
+  background-color: #000;
+}
diff --git a/...ents/elements/gameData/base/inputBase.tsx → ...ents/elements/gameData/common/element.tsx b/...ents/elements/gameData/base/inputBase.tsx → ...ents/elements/gameData/common/element.tsx
@@ -6,6 +6,10 @@ import {DepotPaths, EnumEntry} from '../../../../utils/services/resources';
 
 import {OverlayPopover, OverlayTooltip} from '../../express';
 
+// Style sheet override
+import './element.css';
+
+
 type TitledProps = {
   titleLabel: string,
 }

diff --git a/src/components/elements/gameData/ex/inputSection.tsx b/src/components/elements/gameData/ex/inputSection.tsx
@@ -1,7 +1,7 @@
 import React, {ChangeEventHandler} from 'react';
 import {ElementEnums, ExBuffParams} from '../../../../utils/services/resources/types';
 
-import {EnumResourceChecks, SectionTitle} from '../base/inputBase';
+import {EnumResourceChecks, SectionTitle} from '../common/element';
 
 export type InputData = {
   filterElementCode: Array<number>,

diff --git a/src/components/elements/gameData/ex/outputMain.tsx b/src/components/elements/gameData/ex/outputMain.tsx
@@ -61,7 +61,7 @@ export const ExAbilityOutput = ({exAbilityData, conditionEnums, inputData}: Outp
     .push(
       ...exAbilityData
         .map((exAbilityData: ExAbilityDataEntry, index: number) => (
-          <Col key={index} xs={6}>
+          <Col key={index} lg={6}>
             <ExAbilityEntry entry={exAbilityData} conditionEnums={conditionEnums}/>
           </Col>
         )),

diff --git a/src/components/elements/gameData/skillAtk/inputSection.tsx b/src/components/elements/gameData/skillAtk/inputSection.tsx
@@ -10,7 +10,7 @@ import {
   RadioChecks,
   SectionSubTitle,
   SectionTitle,
-} from '../base/inputBase';
+} from '../common/element';
 
 export type InputData = {
   atkInGame: number,

diff --git a/src/index.css b/src/index.css
@@ -46,10 +46,6 @@ div.footer {
   height: 15vh;
 }
 
-div.btn-group-toggle > label.btn.active {
-  background-color: #c6c6c6;
-}
-
 /* endregion */
 
 /* region Youtube Embed */

diff --git a/src/index.tsx b/src/index.tsx
@@ -1,17 +1,17 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import {BrowserRouter} from 'react-router-dom';
-
-import './index.css';
-import Main from './main';
-import * as serviceWorker from './serviceWorker';
-
-// Style sheets
 import './bootstrap.css';
 
 // import i18n (needs to be bundled)
 import './i18n';
 
+// Style sheets
+import './index.css';
+
+import Main from './main';
+import * as serviceWorker from './serviceWorker';
+
 ReactDOM.render(
   <BrowserRouter>
     <Main/>