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

fixes

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-09-28 11:05:14 +02:00
parent 5849fbf04e
commit c5e6344a2c
3 changed files with 22 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,42 +62,37 @@
background-color: $navbarLinkBackgroundActive;
}
.navbar-page-btn-wrapper {
float: left;
<<<<<<< HEAD
||||||| merged common ancestors
.navbar-page-btn {
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
display: block;
margin: 0;
border-right: 1px solid $tight-form-border;
background-color: $navbarButtonBackground;
padding: 0.4rem 1.0rem 0.4rem 1rem;
color: darken($link-color, 5%);
font-size: $font-size-lg;
padding: 1rem 1rem 0.75rem 1rem;
min-height:: $navbarHeight;
.fa-caret-down {
font-size: 70%;
font-size: 60%;
padding-left: 0.2rem;
}
.fa-chevron-left{
display: none;
.icon-gf {
position: relative;
top: 2px;
font-size: 20px;
line-height: 8px;
margin-right: 0.5rem;
}
=======
margin: 0;
border-right: 1px solid $tight-form-border;
background-color: $navbarButtonBackground;
padding: 0.4rem 1.0rem 0.4rem 1rem;
min-height: $navbarHeight;
.fa-caret-down {
font-size: 70%;
> img {
max-width: 27px;
max-height: 27px;
}
.fa-chevron-left{
display: none;
}
>>>>>>> 0e5e2f3fb990293632402b20107aa09999c3f844
&:hover {
background: $navbarButtonBackgroundHighlight;
&--search {
padding: 1rem 1.5rem 0.75rem 1.5rem;
}
}