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/master' into 11053-remove-native-scrollbar

Browse Source
This commit is contained in:
Daniel Lee
2018-04-11 14:32:19 +02:00
parent 25ec7b5b02 93e1546f73
commit 83f7ac18db
23 changed files with 515 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,10 +1,8 @@
.gicon {
line-height: 1;
display: inline-block;
//width: 1.1057142857em;
//height: 1.1057142857em;
height: 22px;
width: 22px;
width: 1.1057142857em;
height: 1.1057142857em;
text-align: center;
background-repeat: no-repeat;
background-position: center;

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

@@ -123,6 +123,8 @@
position: relative;
opacity: 0.7;
font-size: 130%;
height: 22px;
width: 22px;
}
.fa {

2
public/sass/pages/_dashboard.scss
View File

@@ -33,7 +33,7 @@ div.flot-text {
border: $panel-border;
position: relative;
border-radius: 3px;
//height: 100%;
height: 100%;
&.panel-transparent {
background-color: transparent;