Skip to content

Commit 173a312

Browse files
committed
fix(date-time-options): fix search options css (add flex)
fix ibi-group/trimet-mod-otp#304
1 parent ade2549 commit 173a312

File tree

4 files changed

+34
-31
lines changed

4 files changed

+34
-31
lines changed

lib/components/admin/call-taker.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,13 @@
99
.otp .advanced-search-options {
1010
box-shadow: 0px 5px 3px 0px rgba(0,0,0,0.32157);
1111
}
12+
13+
.otp .search-options {
14+
display: flex;
15+
justify-content: space-between;
16+
flex-flow: row wrap;
17+
}
18+
19+
.otp .search-options > * {
20+
margin-bottom: 5px;
21+
}

lib/components/app/call-taker-panel.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class CallTakerPanel extends Component {
187187
onClick={this._addPlace}
188188
to={to}
189189
/>
190-
<div className='search-options' style={{height: '30px'}}>
190+
<div className='search-options'>
191191
<DateTimeOptions
192192
date={date}
193193
departArrive={departArrive}
@@ -208,9 +208,7 @@ class CallTakerPanel extends Component {
208208
onClick={this._planTrip}
209209
style={{
210210
fontSize: '13px',
211-
padding: '0px 10px',
212-
position: 'absolute',
213-
right: '6px'
211+
padding: '0px 10px'
214212
}} >
215213
Plan
216214
</Button>
@@ -261,7 +259,7 @@ class CallTakerPanel extends Component {
261259
right: '0',
262260
// FIXME: This top pixel value can be variable dependent on
263261
// height of the form above. It may need to be specified differently
264-
top: 193 + intermediatePlaces.length * 45
262+
top: 210 + intermediatePlaces.length * 45
265263
}}
266264
/>
267265
</div>

lib/components/form/call-taker/date-time-options.js

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -190,40 +190,36 @@ export default class DateTimeOptions extends Component {
190190
<option key={o.value} {...o} />
191191
))}
192192
</select>
193-
<span style={{display: 'inline-flex'}}>
194-
<OverlayTrigger
195-
overlay={<Tooltip id='time-tooltip'>{cleanTime}</Tooltip>}
196-
placement='bottom'
197-
trigger={['focus', 'hover']}
198-
>
199-
<input
200-
className='datetime-slim'
201-
onChange={this.handleTimeChange}
202-
onFocus={this.handleTimeFocus}
203-
onKeyDown={onKeyDown}
204-
style={{
205-
fontSize: 'inherit',
206-
lineHeight: '.8em',
207-
marginLeft: '3px',
208-
padding: '0px',
209-
width: '50px'
210-
}}
211-
value={timeInput || dateTime.format('H:mm')}
212-
/>
213-
</OverlayTrigger>
214-
</span>
193+
<OverlayTrigger
194+
overlay={<Tooltip id='time-tooltip'>{cleanTime}</Tooltip>}
195+
placement='bottom'
196+
trigger={['focus', 'hover']}
197+
>
198+
<input
199+
className='datetime-slim'
200+
onChange={this.handleTimeChange}
201+
onFocus={this.handleTimeFocus}
202+
onKeyDown={onKeyDown}
203+
style={{
204+
fontSize: 'inherit',
205+
lineHeight: '.8em',
206+
marginLeft: '3px',
207+
padding: '0px',
208+
width: '50px'
209+
}}
210+
value={timeInput || dateTime.format('H:mm')}
211+
/>
212+
</OverlayTrigger>
215213
<input
216214
className='datetime-slim'
217215
onChange={this.handleDateChange}
218216
onKeyDown={onKeyDown}
219217
style={{
220218
border: 'none',
221219
fontSize: '14px',
222-
left: '146px',
223220
lineHeight: '1em',
224221
outline: 'none',
225-
position: 'absolute',
226-
width: '101px'
222+
width: '107px'
227223
}}
228224
type='date'
229225
value={dateTime.format('YYYY-MM-DD')}

lib/components/form/call-taker/mode-dropdown.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ export default class ModeDropdown extends Component {
7474
onBlur={this._setMode}
7575
onChange={this._onChange}
7676
onKeyDown={onKeyDown}
77-
style={{position: 'absolute', right: '60px'}}
7877
value={this.modeToOptionValue(mode)}
7978
>
8079
{this._getModeOptions().map(o => (

0 commit comments

Comments
 (0)