github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Timepicker] Fix alignment, consistency in error msg (#15343) (#15351)

Browse source 
Fixes https://github.com/elastic/kibana/issues/15333
This commit is contained in:
Tim Sullivan 2017-12-01 14:26:49 -07:00 • committed by GitHub
parent 58bf0637a2
commit 8e27db38d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/ui/public/timepicker/absolute_panel/kbn_timepicker_absolute_panel.html
View file

@ -63,15 +63,20 @@
</div>
</div>
<div class="kbn-timepicker-actions">
<div class="kbn-timepicker-actions kuiVerticalRhythm">
<span
class="kbn-timepicker-action-item kbn-timepicker-error"
ng-show="absolute.from > absolute.to"
>
<strong>From</strong> must occur before <strong>To</strong>
</span>
<button
data-test-subj="timepickerGoButton"
type="submit"
class="kuiButton kuiButton--primary kbn-timepicker-submit-button"
ng-disabled="absolute.from > absolute.to || !absolute.from || !absolute.to"
type="submit"
data-test-subj="timepickerGoButton"
>
Go
</button>
<span class="small" ng-show="absolute.from > absolute.to"><strong>From</strong> must occur before <strong>To</strong></span>
</div>
</form>

13
src/ui/public/timepicker/relative_panel/kbn_timepicker_relative_panel.html
View file

@ -65,11 +65,6 @@
round to the {{units[relative.from.unit.substring(0,1)]}}
</span>
</label>
<div
ng-class="{ 'kbn-timepicker-error': checkRelative() }"
ng-show="checkRelative()">
<strong>From</strong> must occur before <strong>To</strong>
</div>
</div>
</div>
@ -143,11 +138,17 @@
</div>
<div class="kbn-timepicker-actions kuiVerticalRhythm">
<span
class="kbn-timepicker-action-item kbn-timepicker-error"
ng-show="checkRelative()"
>
<strong>From</strong> must occur before <strong>To</strong>
</span>
<button
data-test-subj="timepickerGoButton"
type="submit"
class="kuiButton kuiButton--primary kbn-timepicker-submit-button"
ng-disabled="!(relative.from.preview && relative.to.preview) || checkRelative()"
data-test-subj="timepickerGoButton"
>
Go
</button>

5
src/ui/public/timepicker/timepicker.less
View file

@ -41,6 +41,11 @@
.kbn-timepicker-actions {
display: flex;
justify-content: flex-end;
align-items: baseline;
}
.kbn-timepicker-action-item,
.kbn-timepicker-submit-button {
margin-left: 10px;
}
.kbn-timepicker-submit-button {
min-width: 100px;