Merge branch 'develop' into develop-newgrid-rows

This commit is contained in:
Torkel Ödegaard
2017-08-18 08:57:33 +02:00
12 changed files with 35 additions and 15 deletions

View File

@@ -53,4 +53,8 @@
padding-bottom: 0;
}
.filter-table__avatar {
width: 25px;
height: 25px;
border-radius: 50%;
}

View File

@@ -5,7 +5,8 @@
flex-direction: column;
width: $side-menu-width;
background: $navbarBackground;
z-index: 1;
z-index: 10;
box-shadow: 0 0 20px black;
a:focus {
text-decoration: none;
@@ -17,6 +18,9 @@
background: $side-menu-bg;
position: initial;
height: auto;
box-shadow: 0 0 20px black;
position: relative;
z-index: 1;
}
.sidemenu__top,
.sidemenu__bottom {

View File

@@ -1,6 +1,7 @@
.tabbed-view {
background-color: $page-bg;
background-color: $panel-bg;
padding: $spacer*3;
margin-bottom: $dashboard-padding;
&.tabbed-view--panel-edit {
padding: 0;

View File

@@ -46,6 +46,10 @@
}
}
.navbar {
box-shadow: none;
}
.navbar-page-btn {
border-color: transparent;
background: transparent;