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

This commit is contained in:
Albert Santoni 2015-08-19 11:47:20 -04:00
commit a3e9a7355c
2 changed files with 5 additions and 8 deletions

View File

@ -108,6 +108,10 @@ div.ColVis_collectionBackground {
}
@media screen and (max-width: 1475px) {
.wrapper {
-webkit-flex-flow: column !important;
flex-flow: column !important;
}
.content-pane {
height: auto !important;
width: 100% !important;
@ -532,10 +536,6 @@ li.ui-state-default {
margin: 4px 0;
padding: 0;
display: flex;
flex-direction: column;
justify-content: center;
}
.spl_sortable .list-item-container {
@ -695,7 +695,7 @@ th.library_checkbox {
position: fixed !important;
}
/* Since the z-index gets applied dynamically to the */
/* Since the z-index gets applied dynamically */
#ui-datepicker-div {
z-index: 1000 !important;
}

View File

@ -12,10 +12,7 @@ var AIRTIME = (function(AIRTIME){
viewport,
$lib,
$pl,
$togglePl = $("<button id='pl_edit' class='btn btn-small' href='#' title='"+$.i18n._("Open Media Builder")+"'>"+$.i18n._("Open Media Builder")+"</button>"),
widgetHeight,
resizeTimeout,
width,
$tabCount = 0,
$openTabs = {};