IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-30 04:34:23 -06:00
Code Issues Packages Projects Releases Wiki Activity

TimePicker: align position between dashboard and explore (#17940)

Browse Source
This commit is contained in:
Torkel Ödegaard 2019-07-05 07:49:45 +02:00 committed by GitHub
parent 7e95ded164
commit de71875e6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/grafana-ui/src/components/TimePicker/_TimePicker.scss
View File

@ -29,7 +29,7 @@
z-index: $zindex-dropdown;
flex-direction: column;
max-width: 600px;
top: 50px;
top: 41px;
right: 0px;
.time-picker-popover-body {
@ -256,6 +256,8 @@ $arrowPadding: $arrowPaddingToBorder * 3;
.dashboard-timepicker-wrapper {
position: relative;
display: flex;
// this is to align popover position with explore ( .explore-toolbar-content-item class)
padding: 2px 2px;
.gf-form-select-box__menu {
right: 0;

19
public/sass/pages/_explore.scss
View File

@ -68,8 +68,8 @@
flex: 1 1 0;
flex-flow: row nowrap;
font-size: 18px;
min-height: 55px;
line-height: 55px;
min-height: $navbarHeight;
line-height: $navbarHeight;
justify-content: space-between;
align-items: center;
}
@ -88,13 +88,12 @@
.explore-toolbar-content-item {
display: flex;
padding: 10px 2px;
}
padding: 2px 2px;
.explore-toolbar-content-item:first-child {
padding-left: $dashboard-padding;
margin-right: auto;
display: flex;
&:first-child {
padding-left: $dashboard-padding;
margin-right: auto;
}
}
@media only screen and (max-width: 1545px) {
@ -122,10 +121,6 @@
margin: 0;
}
}
.explore-toolbar-content-item {
padding: 2px 2px;
}
}
@media only screen and (max-width: 702px) {