mirror of
https://github.com/grafana/grafana.git
synced 2025-02-25 18:55:37 -06:00
Merge branch 'master' into react-panels-ux-idea2
This commit is contained in:
@@ -221,6 +221,31 @@ $btn-service-icon-width: 35px;
|
||||
}
|
||||
}
|
||||
|
||||
//Toggle button
|
||||
|
||||
.toggle-btn {
|
||||
background: $input-label-bg;
|
||||
color: $text-color-weak;
|
||||
box-shadow: $card-shadow;
|
||||
|
||||
&:first-child {
|
||||
border-radius: 2px 0 0 2px;
|
||||
margin: 0;
|
||||
}
|
||||
&:last-child {
|
||||
border-radius: 0 2px 2px 0;
|
||||
margin-left: 0 !important;
|
||||
}
|
||||
|
||||
&.active {
|
||||
background-color: lighten($input-label-bg, 5%);
|
||||
color: $link-color;
|
||||
&:hover {
|
||||
cursor: default;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//Button animations
|
||||
|
||||
.btn-loading span {
|
||||
|
||||
@@ -3,7 +3,7 @@ $select-menu-max-height: 300px;
|
||||
$select-item-font-size: $font-size-base;
|
||||
$select-item-bg: $dropdownBackground;
|
||||
$select-item-fg: $input-color;
|
||||
$select-option-bg: $dropdownBackground;
|
||||
$select-option-bg: $menu-dropdown-bg;
|
||||
$select-option-color: $input-color;
|
||||
$select-noresults-color: $text-color;
|
||||
$select-input-bg: $input-bg;
|
||||
@@ -82,20 +82,14 @@ $select-option-selected-bg: $dropdownLinkBackgroundActive;
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.Select-option {
|
||||
border-left: 2px solid transparent;
|
||||
}
|
||||
|
||||
.Select-option.is-focused {
|
||||
background-color: $dropdownLinkBackgroundHover;
|
||||
color: $dropdownLinkColorHover;
|
||||
|
||||
&::before {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
top: 0;
|
||||
height: 100%;
|
||||
width: 2px;
|
||||
display: block;
|
||||
content: '';
|
||||
background-image: linear-gradient(to bottom, #ffd500 0%, #ff4400 99%, #ff4400 100%);
|
||||
}
|
||||
@include left-brand-border-gradient();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,6 +19,15 @@
|
||||
padding-left: $spacer * 1.5;
|
||||
}
|
||||
|
||||
code {
|
||||
@include font-family-monospace();
|
||||
font-size: $font-size-base - 2;
|
||||
background-color: $code-tag-bg;
|
||||
color: $text-color;
|
||||
border: 1px solid $code-tag-border;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
a {
|
||||
@extend .external-link;
|
||||
}
|
||||
|
||||
@@ -17,10 +17,6 @@
|
||||
padding-left: 0px;
|
||||
}
|
||||
|
||||
.graph-legend-table {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.graph-legend-table .graph-legend-series {
|
||||
display: table-row;
|
||||
}
|
||||
@@ -35,7 +31,6 @@
|
||||
}
|
||||
|
||||
.datapoints-warning {
|
||||
pointer: none;
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
|
||||
@@ -212,11 +212,20 @@
|
||||
color: $list-item-link-color;
|
||||
}
|
||||
|
||||
.search-item__body-folder-title {
|
||||
color: $text-color-weak;
|
||||
font-size: $font-size-xs;
|
||||
line-height: 11px;
|
||||
position: relative;
|
||||
top: -1px;
|
||||
}
|
||||
|
||||
.search-item__icon {
|
||||
padding: 5px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
flex: 0 0 auto;
|
||||
font-size: 19px;
|
||||
padding: 5px 2px 5px 10px;
|
||||
padding: 0 2px 0 10px;
|
||||
}
|
||||
|
||||
.search-item__tags {
|
||||
|
||||
@@ -55,6 +55,25 @@
|
||||
margin-top: 2 * $panel-margin;
|
||||
}
|
||||
|
||||
.time-series-disclaimer {
|
||||
width: 300px;
|
||||
margin: $panel-margin auto;
|
||||
padding: 10px 0;
|
||||
border-radius: $border-radius;
|
||||
text-align: center;
|
||||
background-color: $panel-bg;
|
||||
|
||||
.disclaimer-icon {
|
||||
color: $yellow;
|
||||
margin-right: $panel-margin/2;
|
||||
}
|
||||
|
||||
.show-all-time-series {
|
||||
cursor: pointer;
|
||||
color: $external-link-color;
|
||||
}
|
||||
}
|
||||
|
||||
.elapsed-time {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
@@ -69,7 +88,7 @@
|
||||
}
|
||||
|
||||
.datasource-picker {
|
||||
min-width: 10rem;
|
||||
min-width: 200px;
|
||||
}
|
||||
|
||||
.timepicker {
|
||||
|
||||
Reference in New Issue
Block a user