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 branch 'master' into 10427_addpanel_filter

Browse Source
This commit is contained in:
Marcus Efraimsson
2018-04-18 11:36:13 +02:00
parent 23f644c2f5 b7b0ca2b90
commit 82054e1a3e
124 changed files with 2317 additions and 1355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/sass/base/_icons.scss
View File

@@ -120,6 +120,10 @@
background-image: url('../img/icons_#{$theme-name}_theme/icon_data_sources.svg');
}
.gicon-editor {
background-image: url('../img/icons_#{$theme-name}_theme/icon_editor.svg');
}
.gicon-folder-new {
background-image: url('../img/icons_#{$theme-name}_theme/icon_add_folder.svg');
}
@@ -180,6 +184,10 @@
background-image: url('../img/icons_#{$theme-name}_theme/icon_variable.svg');
}
.gicon-viewer {
background-image: url('../img/icons_#{$theme-name}_theme/icon_viewer.svg');
}
.gicon-zoom-out {
background-image: url('../img/icons_#{$theme-name}_theme/icon_zoom_out.svg');
}

9
public/sass/components/_dashboard_settings.scss
View File

@@ -64,8 +64,13 @@
background: $page-bg;
}
i {
padding-right: 5px;
.gicon {
margin-bottom: 2px;
}
.fa {
font-size: 17px;
width: 16px;
}
}

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

@@ -85,3 +85,7 @@
}
}
}
.filter-table__weak-italic {
font-style: italic;
color: $text-color-weak;
}

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

@@ -4,7 +4,7 @@
display: inline-block;
padding: 2px 4px;
font-size: $font-size-base * 0.846;
font-weight: bold;
font-weight: $font-weight-semi-bold;
line-height: 14px; // ensure proper line-height if floated
color: $white;
vertical-align: baseline;