Skip to content
This repository was archived by the owner on Apr 7, 2023. It is now read-only.

Commit eeb4a86

Browse files
committed
Allow 'named' standard module (special case for bulkheads)
1 parent 3a265b2 commit eeb4a86

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/app/components/StandardSlot.jsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export default class StandardSlot extends TranslatedComponent {
3333

3434
if (this.props.selected) {
3535
menu = <AvailableModulesMenu
36+
className='standard'
3637
modules={modules}
3738
shipMass={ship.ladenMass}
3839
m={m}
@@ -47,17 +48,17 @@ export default class StandardSlot extends TranslatedComponent {
4748
<div className={cn('details-container', { warning: warning && warning(slot.m) })}>
4849
<div className={'sz'}>{slot.maxClass}</div>
4950
<div>
50-
<div className='l'>{classRating + ' ' + translate(m.grp)}</div>
51+
<div className='l'>{classRating} {translate(m.grp == 'bh' ? m.grp : m.name || m.grp)}</div>
5152
<div className={'r'}>{m.mass || m.fuel || 0}{units.T}</div>
5253
<div className={'cb'}>
53-
{ m.name ? <div className='l'>{translate(m.name)}</div> : null }
54-
{ m.optmass ? <div className='l'>{translate('optimal mass') + ': '}{m.optmass}{units.T}</div> : null }
55-
{ m.maxmass ? <div className='l'>{translate('max mass') + ': '}{m.maxmass}{units.T}</div> : null }
54+
{ m.grp == 'bh' && m.name ? <div className='l'>{translate(m.name)}</div> : null }
55+
{ m.optmass ? <div className='l'>{translate('optimal mass')}: {m.optmass}{units.T}</div> : null }
56+
{ m.maxmass ? <div className='l'>{translate('max mass')}: {m.maxmass}{units.T}</div> : null }
5657
{ m.range ? <div className='l'>{translate('range')}: {m.range}{units.km}</div> : null }
5758
{ m.time ? <div className='l'>{translate('time')}: {formats.time(m.time)}</div> : null }
5859
{ m.eff ? <div className='l'>{translate('efficiency')}: {m.eff}</div> : null }
5960
{ m.pGen ? <div className='l'>{translate('power')}: {m.pGen}{units.MW}</div> : null }
60-
{ m.maxfuel ? <div className='l'>{translate('max') + ' ' + translate('fuel') + ': '}{m.maxfuel}{units.T}</div> : null }
61+
{ m.maxfuel ? <div className='l'>{translate('max')} {translate('fuel')}: {m.maxfuel}{units.T}</div> : null }
6162
{ m.weaponcapacity ? <div className='l'>{translate('WEP')}: {m.weaponcapacity}{units.MJ} / {m.weaponrecharge}{units.MW}</div> : null }
6263
{ m.systemcapacity ? <div className='l'>{translate('SYS')}: {m.systemcapacity}{units.MJ} / {m.systemrecharge}{units.MW}</div> : null }
6364
{ m.enginecapacity ? <div className='l'>{translate('ENG')}: {m.enginecapacity}{units.MJ} / {m.enginerecharge}{units.MW}</div> : null }

src/less/select.less

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ select {
102102
}
103103
}
104104

105-
&.disabled {
105+
&.disabled, &.disabled:hover {
106106
cursor: not-allowed;
107107
border-color: @disabled;
108108
color: @disabled;
@@ -150,4 +150,10 @@ select {
150150
}
151151
}
152152

153+
&.standard {
154+
ul {
155+
width: 16.25em;
156+
}
157+
}
158+
153159
}

0 commit comments

Comments
 (0)