Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

This commit is contained in:
Duncan Sommerville 2015-08-18 18:45:58 -04:00
commit 11652da40b
7 changed files with 24 additions and 7 deletions

View file

@ -111,7 +111,7 @@
border: 1px solid #202020;
border-top: 1px solid #353535;
border-left: 1px solid #2a2a2a;
background-color: #242424;
background-color: #2F2F2F; /*#242424*/
color: #e2e2e2;
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);

View file

@ -3605,11 +3605,16 @@ button.btn-icon-text > i.icon-white {
#sub-menu {
width: 130px;
border-right: 1px solid #5b5b5b;
background: #212121;
font-size: 14px;
color: #cecece;
padding: 10px;
}
#sub-menu h3 {
padding: 0px;
}
#sub-menu .navigation {
list-style: none;
padding-left: 0px;
@ -3629,6 +3634,10 @@ button.btn-icon-text > i.icon-white {
text-decoration: none;
}
.page-sub-menu {
/*background-color: #252525;*/
}
#listenerstat_content {
width: 100%;
}
@ -3646,3 +3655,9 @@ button.btn-icon-text > i.icon-white {
height: 19px;
margin-top: -2px;
}
hr {
border: 0;
height: 1px;
background: rgba(255,255,255,0.2);
}