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

Merged trent's styles and added admin submenu

Browse Source
This commit is contained in:
Matt
2016-02-19 22:00:29 -05:00
parent 27dc32e2e8 6721cec73f
commit 1144988443
14 changed files with 75 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,6 +73,9 @@
.btn-primary {
@include buttonBackground($btn-primary-bg, $btn-primary-bg-hl);
}
.btn-secondary {
@include buttonBackground($btn-secondary-bg, $btn-secondary-bg-hl);
}
// Warning appears are orange
.btn-warning {
@include buttonBackground($btn-warning-bg, $btn-warning-bg-hl);

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

@@ -281,7 +281,7 @@ div.flot-text {
border-top: 0;
border-right: 0;
border-left: 0;
border-bottom: 2px solid transparent;
border-bottom: 1px solid transparent;
padding: 1.2rem .5rem .4rem .5rem;
}
}

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

@@ -189,6 +189,15 @@
.sidemenu-org-avatar {
width: 44px;
background-color: $gray-2;
border-radius: 50%;
.no-avatar {
color: $text-color;
text-shadow: 0 1px 0 $dark-1;
padding-left: 17px;
position: relative;
top: 5px;
}
}
.sidemenu-org-avatar > img {