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

Merge remote-tracking branch 'upstream/develop' into graph-legend-v5

Browse Source
This commit is contained in:
Alexander Zobnin
2017-12-07 12:45:08 +03:00
parent 58d40eb6a0 58fb35c5cb
commit 9bff005faf
51 changed files with 1325 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/sass/components/_buttons.scss
View File

@@ -106,7 +106,7 @@
}
// Inverse appears as dark gray
.btn-inverse {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color);
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color, $btn-inverse-text-shadow);
//background: $card-background;
box-shadow: $card-shadow;
//border: 1px solid $tight-form-func-highlight-bg;

5
public/sass/components/_cards.scss
View File

@@ -200,9 +200,8 @@
}
.card-item {
border-bottom: .2rem solid $page-bg;
border-radius: 0;
box-shadow: none;
border-bottom: 3px solid $page-bg;
border-radius: 2px;
}
.card-item-header {

2
public/sass/components/_dashboard_grid.scss
View File

@@ -8,7 +8,7 @@
}
.react-grid-item {
display: none;
display: none !important;
transition-property: none !important;
}

14
public/sass/components/_dashboard_list.scss
View File

@@ -1,19 +1,25 @@
.dashboard-list {
height: 75%;
.search-results-container {
padding-left: 0;
padding: 5px 0 0 0;
}
}
.search-results-filter-row {
height: 35px;
display: flex;
justify-content: space-between;
.gf-form-button-row {
padding-top: 0;
button:last-child {
margin-right: 0;
}
}
}
.search-results-filter-row__filters {
display: flex;
width: 300px;
}
.search-results-filter-row__filters-item {

3
public/sass/components/_filter-table.scss
View File

@@ -17,7 +17,7 @@
tbody {
tr:nth-child(odd) {
background: $dark-2;
background: $table-bg-odd;
}
}
@@ -34,7 +34,6 @@
padding: $table-cell-padding;
line-height: 30px;
height: 30px;
border-bottom: 1px solid black;
white-space: nowrap;
&.filter-table__switch-cell {

6
public/sass/components/_navbar.scss
View File

@@ -74,15 +74,15 @@
}
.navbar-button {
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color);
@include buttonBackground($btn-inverse-bg, $btn-inverse-bg-hl, $btn-inverse-text-color, $btn-inverse-text-shadow);
display: inline-block;
font-weight: $btn-font-weight;
padding: 8px 11px;
line-height: 16px;
color: $text-muted;
border: 1px solid #151515;
margin-right: 1px;
border: 1px solid $navbar-button-border;
margin-right: 3px;
white-space: nowrap;
.gicon {

15
public/sass/components/_page_header.scss
View File

@@ -72,6 +72,21 @@
text-transform: uppercase;
}
.page-header__select_nav {
margin-bottom: 10px;
@include media-breakpoint-up(lg) {
display: none;
}
}
.page-header__tabs {
display: none;
@include media-breakpoint-up(lg) {
display: block;
}
}
.page-breadcrumbs {
display: flex;
padding: 10px 0;

2
public/sass/components/_panel_pluginlist.scss
View File

@@ -18,7 +18,7 @@
}
.pluginlist-image {
width: 20px;
width: 17px;
}
.pluginlist-title {

24
public/sass/components/_search.scss
View File

@@ -120,8 +120,9 @@
display: flex;
flex-grow: 1;
&:hover {
color: $text-color-weak;
&:hover, &.selected {
color: $link-hover-color;
.search-section__header__toggle {
background: $tight-form-func-bg;
color: $link-hover-color;
@@ -129,12 +130,8 @@
}
}
.search-section__header__with-checkbox {
display: flex;
}
.search-section__header__icon {
padding: 5px 10px;
padding: 2px 10px;
}
.search-section__header__toggle {
@@ -145,14 +142,6 @@
flex-grow: 1;
}
.search-item__with-checkbox {
display: flex;
.search-item {
margin: 1px 3px;
}
}
.search-item {
@include list-item();
@include left-brand-border();
@@ -163,11 +152,8 @@
white-space: nowrap;
padding: 0px;
&:hover {
&:hover, &.selected {
@include left-brand-border-gradient();
}
&.selected {
background: $list-item-hover-bg;
}
}

3
public/sass/components/_sidemenu.scss
View File

@@ -110,7 +110,7 @@
display: inline-block;
.fa, .icon-gf, .gicon {
color: $link-color;
color: $side-menu-link-color;
position: relative;
opacity: .7;
font-size: 130%;
@@ -135,6 +135,7 @@
white-space: nowrap;
background-color: $side-menu-item-hover-bg;
font-size: 17px;
color: #ebedf2;
}
li.sidemenu-org-switcher {

45
public/sass/components/_switch.scss
View File

@@ -102,6 +102,51 @@ $switch-height: 1.5rem;
}
}
.gf-form-switch--transparent {
input + label {
background: transparent;
}
input + label::before, input + label::after {
background: transparent;
}
&:hover {
input + label::before {
background: transparent;
}
input + label::after {
background: transparent;
}
}
}
.gf-form-switch--search-result__section {
min-width: 3.3rem;
margin-right: -0.3rem;
input + label {
height: 1.7rem;
}
}
.gf-form-switch--search-result__item {
min-width: 2.6rem;
input + label {
height: 2.7rem;
}
}
.gf-form-switch--search-result-filter-row__checkbox {
min-width: 4.7rem;
input + label {
height: 2.5rem;
}
}
gf-form-switch[disabled] {
.gf-form-label,
.gf-form-switch input + label {

2
public/sass/components/_tabbed_view.scss
View File

@@ -26,7 +26,7 @@
.tabbed-view-panel-title {
float: left;
padding-top: 1rem;
padding-top: 9px;
margin: 0 2rem 0 0;
}

16
public/sass/components/_tabs.scss
View File

@@ -16,7 +16,7 @@
position: relative;
display: block;
border: solid transparent;
border-width: 2px 1px 1px;
border-width: 0 1px 1px;
border-radius: 3px 3px 0 0;
i {
@@ -31,9 +31,21 @@
&.active,
&.active:hover,
&.active:focus {
border-color: $orange $dark-4 transparent;
border-color: $orange $tab-border-color transparent;
background: $page-bg;
color: $link-color;
overflow: hidden;
&::before {
display: block;
content: ' ';
position: absolute;
left: 0;
right: 0;
height: 2px;
top: 0;
background-image: linear-gradient(to right, #ffd500 0%, #ff4400 99%, #ff4400 100%);
}
}
}