IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

new timepicker is working

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-12-08 14:38:33 +01:00
parent 9369a87e93
commit db663c380b
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/features/dashboard/timepicker/dropdown.html
View File

@ -1 +0,0 @@

2
public/app/features/dashboard/timepicker/timepicker.html
View File

@ -27,7 +27,7 @@
<div ng-if="ctrl.isOpen" class="gf-timepicker-dropdown">
<form name="timeForm" class="gf-timepicker-absolute-section">
<h3 class="section-heading">Time range</h3>
<h3 class="section-heading">Custom range</h3>
<label class="small">From:</label>
<div class="gf-form-inline">

7
public/sass/components/_timepicker.scss
View File

@ -17,7 +17,7 @@
top: $navbarHeight;
right: 0;
padding: 10px 20px;
background-color: $search-filter-box-bg;
background-color: $page-bg;
border-radius: 0 0 0 4px;
box-shadow: $search-shadow;
}
@ -25,7 +25,6 @@
.gf-timepicker-absolute-section {
width: 290px;
float: left;
border-right: 1px solid $divider-border-color;
padding: 0 10px;
select {
width: 183px;
@ -43,7 +42,7 @@
font-size: 75%;
padding: 3px;
border-radius: 2px;
font-weight: bold;
font-weight: 500;
margin-left: 4px;
}
@ -61,7 +60,7 @@
li.active {
border-bottom: 1px solid $blue;
margin: 3px 0;
font-weight: bold;
font-weight: 500;
}
}
}