optolith/optolith-client
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Reordered personal data on main sheet

Browse Source
This commit is contained in:
Lukas Obermann
2016-12-27 12:24:17 +13:00
parent bf6b64068c
commit f6a1afd091
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/bundle.js
Vendored
+2 -2
View File
@@ -43674,7 +43674,7 @@
const profile = _ProfileStore2.default.getAll();
const race = _RaceStore2.default.getCurrent();
const culture = _CultureStore2.default.getCurrent();
const profession = _ProfessionStore2.default.getCurrent().name;
const profession = _ProfessionStore2.default.getCurrent();
const professionVariant = _ProfessionVariantStore2.default.getCurrent();
const haircolorTags = _ProfileStore2.default.getHaircolorTags();
const eyecolorTags = _ProfileStore2.default.getEyecolorTags();
@@ -44228,9 +44228,9 @@
_react2.default.createElement(_Plain2.default, { className: 'haircolor', label: 'Haarfarbe', value: haircolorName }),
_react2.default.createElement(_Plain2.default, { className: 'eyecolor', label: 'Augenfarbe', value: eyecolorName }),
_react2.default.createElement(_Plain2.default, { className: 'culture', label: 'Kultur', value: cultureName }),
_react2.default.createElement(_Plain2.default, { className: 'socialstatus', label: 'Sozialstatus', value: socialstatusName }),
_react2.default.createElement(_Plain2.default, { className: 'profession', label: 'Profession', value: professionName }),
_react2.default.createElement(_Plain2.default, { className: 'title', label: 'Titel', value: title }),
_react2.default.createElement(_Plain2.default, { className: 'socialstatus', label: 'Sozialstatus', value: socialstatusName }),
_react2.default.createElement(_Plain2.default, { className: 'characteristics', label: 'Charakteristika', value: characteristics }),
_react2.default.createElement(_Plain2.default, { className: 'otherinfo', label: 'Sonstiges', value: otherinfo })
),
dist/bundle.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
js/views/profile/MainSheet.js
+1 -1
View File
@@ -25,7 +25,7 @@ export default class MainSheet extends Component {
const profile = ProfileStore.getAll();
const race = RaceStore.getCurrent();
const culture = CultureStore.getCurrent();
const profession = ProfessionStore.getCurrent().name;
const profession = ProfessionStore.getCurrent();
const professionVariant = ProfessionVariantStore.getCurrent();
const haircolorTags = ProfileStore.getHaircolorTags();
const eyecolorTags = ProfileStore.getEyecolorTags();
js/views/profile/MainSheet.scss
+4 -4
View File
@@ -9,11 +9,11 @@
align-content: flex-start;
overflow: hidden;
.name, .characteristics, .other {
.name, .profession, .title, .characteristics, .other {
width: 100%;
}
.family, .placeofbirth, .dateofbirth, .race, .haircolor, .eyecolor, .culture, .profession, .title, .socialstatus {
.family, .placeofbirth, .dateofbirth, .race, .haircolor, .eyecolor, .culture, .socialstatus {
width: 50%;
}
@@ -21,13 +21,13 @@
width: 25%;
}
.name, .family, .dateofbirth, .race, .haircolor, .culture, .title, .characteristics, .otherinfo {
.name, .family, .dateofbirth, .race, .haircolor, .culture, .profession, .title, .characteristics, .otherinfo {
.label {
width: 80px;
}
}
.placeofbirth, .age, .size, .eyecolor, .profession, .socialstatus {
.placeofbirth, .age, .size, .eyecolor, .socialstatus {
.label {
width: 63px;
}
js/views/profile/MainSheetPersonalData.js
+1 -1
View File
@@ -57,9 +57,9 @@ export default class MainSheetPersonalData extends Component {
<Plain className="haircolor" label="Haarfarbe" value={haircolorName} />
<Plain className="eyecolor" label="Augenfarbe" value={eyecolorName} />
<Plain className="culture" label="Kultur" value={cultureName} />
<Plain className="socialstatus" label="Sozialstatus" value={socialstatusName} />
<Plain className="profession" label="Profession" value={professionName} />
<Plain className="title" label="Titel" value={title} />
<Plain className="socialstatus" label="Sozialstatus" value={socialstatusName} />
<Plain className="characteristics" label="Charakteristika" value={characteristics} />
<Plain className="otherinfo" label="Sonstiges" value={otherinfo} />
</div>