maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Normalize timepicker toggle into same style as other buttons

Browse source
This commit is contained in:
Rashid Khan 2016-03-21 12:51:33 -07:00
parent ba558c2007
commit 4f60573dad
2 changed files with 17 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ui/public/styles/base.less
View file

@ -142,8 +142,13 @@ a {
.kibana-nav-options {
padding-bottom: 0;
.kibana-nav-actions {
margin-left: auto;
.button-group > :last-child {
border-radius: 0;
}
}
.kibana-nav-info {
line-height: 30px;

44
src/ui/public/timepicker/toggle.html
View file

@ -1,32 +1,12 @@
<ul ng-show="timefilter.enabled" class="nav navbar-nav navbar-right navbar-timepicker">
<li>
<button
ng-click="toggleRefresh()"
ng-show="timefilter.refreshInterval.value > 0">
<i class="fa" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
</button>
</li>
<li
ng-show="timefilter.refreshInterval.value > 0 || configTemplate.is('interval') || configTemplate.is('filter')">
<button ng-click="configTemplate.toggle('interval')"
ng-class="{active: configTemplate.is('interval') }"
class="navbar-timepicker-auto-refresh-desc">
<span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
<span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
</button>
</li>
<li>
<button ng-class="{active: configTemplate.is('filter')}"
ng-click="configTemplate.toggle('filter')"
aria-haspopup="true"
aria-expanded="false"
class="navbar-timepicker-time-desc">
<i aria-hidden="true" class="fa fa-clock-o"></i>
<pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
</button>
</li>
</ul>
<div ng-show="timefilter.enabled" class="button-group">
<button ng-click="toggleRefresh()" ng-show="timefilter.refreshInterval.value > 0">
<i class="fa fa-pause" ng-class="timefilter.refreshInterval.pause ? 'fa-play' : 'fa-pause'"></i>
</button>
<button ng-click="configTemplate.toggle('interval')" ng-class="{active: configTemplate.is('interval') }" class="navbar-timepicker-auto-refresh-desc" ng-show="timefilter.refreshInterval.value > 0 || configTemplate.is('interval') || configTemplate.is('filter')">
<span ng-show="timefilter.refreshInterval.value === 0"><i class="fa fa-repeat"></i> Auto-refresh</span>
<span ng-show="timefilter.refreshInterval.value > 0">{{timefilter.refreshInterval.display}}</span>
</button><button ng-class="{active: configTemplate.is('filter')}" ng-click="configTemplate.toggle('filter')" aria-haspopup="true" aria-expanded="false" class="navbar-timepicker-time-desc">
<i aria-hidden="true" class="fa fa-clock-o"></i>
<pretty-duration from="timefilter.time.from" to="timefilter.time.to"></pretty-duration>
</button>
</div>