diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml
index f9363e701..7fe85172e 100644
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@@ -18,8 +18,16 @@
-
\ No newline at end of file
diff --git a/airtime_mvc/public/css/_showbuilder.css b/airtime_mvc/public/css/_showbuilder.css
index ddff8d84d..f8e3b7038 100644
--- a/airtime_mvc/public/css/_showbuilder.css
+++ b/airtime_mvc/public/css/_showbuilder.css
@@ -20,25 +20,6 @@
background-color: #242424;
}
-.wide-panel {
- display: -webkit-box;
- display: -moz-box;
- display: -ms-flexbox;
- display: -webkit-flex;
- display: flex;
- -webkit-flex-flow: column;
- flex-flow: column;
-
- /* Account for the left pane */
- flex: 6 auto;
- min-width: 555px;
-}
-
-.outer-datatable-wrapper {
- position: relative;
- flex: 1;
-}
-
@media screen and (max-width: 1280px) {
.wrapper {
-webkit-flex-flow: column !important;
@@ -146,14 +127,6 @@ div.btn > span {
left: 4px;
}
-.dataTables_scrolling {
- position: absolute;
- bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
- top: 37px;
- left: 0;
- right: 0;
-}
-
#library_display, #show_builder_table {
border: none;
}
diff --git a/airtime_mvc/public/css/addmedia.css b/airtime_mvc/public/css/addmedia.css
index 80595b8c4..f7c48bf7c 100644
--- a/airtime_mvc/public/css/addmedia.css
+++ b/airtime_mvc/public/css/addmedia.css
@@ -2,18 +2,19 @@
#recent_uploads_wrapper
{
- width: 100%;
- margin-bottom: 40px;
+ position: relative;
+
}
#recent_uploads_table
{
width: 100%;
+ table-layout: fixed;
}
#recent_uploads_table_wrapper
{
- width: 100%;
+ position: absolute;
}
table#recent_uploads_table td
@@ -267,7 +268,7 @@ table#recent_uploads_table td
border: 2px solid rgba(0, 0, 0, 0.3);
background: #333;
padding: 20px 20px;
- max-height: 300px;
+ max-height: 1000px;
overflow-y: auto;
}
@@ -303,7 +304,7 @@ table#recent_uploads_table td
border: 2px dashed rgba(255, 255, 255, 0.2);
border-radius: 15px;
display: block;
- width: 50%;
+ position: relative;
background-color: rgba(0, 0, 0, 0.1);
-webkit-box-shadow: inset 0px -7px 27px -4px rgba(0,0,0,0.55);
@@ -319,7 +320,6 @@ table#recent_uploads_table td
display: inline-block;
vertical-align: top;
margin: 16px;
- /*min-height: 100px*/
}
.dropzone .dz-preview:hover {
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 9f626521c..a2b5007d0 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -3605,9 +3605,12 @@ button.btn-icon-text > i.icon-white {
/* Uploads/Dropzone */
#upload_form {
- width: 100%;
- min-width: 555px;
+ /* width: 100%;
+ min-width: 555px;*/
margin-bottom: 10px;
+ margin-right: 10px;
+ height: 100%;
+ position:relative;
}
#sub-menu-wrapper {
@@ -3756,3 +3759,29 @@ li .ui-state-hover {
border: 0px;
}
+.wide-panel {
+ display: -webkit-box;
+ display: -moz-box;
+ display: -ms-flexbox;
+ display: -webkit-flex;
+ display: flex;
+ -webkit-flex-flow: column;
+ flex-flow: column;
+
+ /* Account for the left pane */
+ flex: 6 auto;
+ min-width: 500px;
+}
+
+.outer-datatable-wrapper {
+ position: relative;
+ flex: 1;
+}
+
+.dataTables_scrolling {
+ position: absolute;
+ bottom: 37px; /* 36 px is the size of the header/footer + 1px because there's no internal border */
+ top: 37px;
+ left: 0;
+ right: 0;
+}