Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev

This commit is contained in:
Albert Santoni 2015-10-19 17:31:31 -04:00
commit 195f1f0e9a

View file

@ -288,15 +288,13 @@ select {
color:#ff5d1a;
}
.now-playing-block {
/*width:35%;*/
flex: 1 auto;
flex: 1 0;
background: url(images/masterpanel_spacer.png) no-repeat 0 0;
margin-left: 152px;
padding-left: 14px;
}
.show-block {
/*width:30%;*/
flex: 1 auto;
flex: 1 0;
}
.text-row {
height:30px;