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 develop

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-10-17 11:17:28 +02:00
parent 00c2153edd 45a572ebd8
commit d8230f8fa7
28 changed files with 124 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/sass/components/_gf-form.scss
View File

@@ -125,6 +125,7 @@ $gf-form-margin: 3px;
// text areas should be scrollable
@at-root textarea#{&} {
overflow: auto;
white-space: pre-wrap;
}
// Unstyle the caret on `<select>`s in IE10+.

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

@@ -211,15 +211,6 @@
margin-right: 0px;
line-height: initial;
}
.close {
margin-right: 5px;
color: $link-color;
opacity: 0.7;
text-shadow: none;
}
.editor-row {
padding: 5px;
}
}
.annotation-tags {