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

airtime_mvc/public/css/addmedia.css

@@ -2,18 +2,20 @@
 
 #recent_uploads_wrapper
 {
-	width: 100%;
-	margin-bottom: 40px;
+	position: relative;
+	min-height: 500px;
+
 }
 
 #recent_uploads_table
 {
 	width: 100%;
+	table-layout: fixed;
 }
 
 #recent_uploads_table_wrapper
 {
-	width: 100%;
+	position: absolute;
 }
 
 table#recent_uploads_table td
@@ -263,16 +265,16 @@ table#recent_uploads_table td
 }
 
 .dropzone {
-	min-height: 150px;
+	min-height: 30%;
 	border: 2px solid rgba(0, 0, 0, 0.3);
 	background: #333;
 	padding: 20px 20px;
-	max-height: 300px;
+	max-height: 75%;
 	overflow-y: auto;
 }
 
 .dropzone.dz-clickable {
-	cursor: pointer
+	cursor: pointer;
 }
 
 .dropzone.dz-clickable * {
@@ -303,7 +305,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 +321,6 @@ table#recent_uploads_table td
 	display: inline-block;
 	vertical-align: top;
 	margin: 16px;
-	/*min-height: 100px*/
 }
 
 .dropzone .dz-preview:hover {

airtime_mvc/public/css/billing.css

@@ -56,8 +56,8 @@
 	border-spacing: 0px;
     border-collapse: separate;
 	border: 1px solid #777;
-	width: 600px;
-	margin-left: -100px;
+	width: 680px;
+	margin-left: -140px;
 	/*background-color: #555;*/
 	table-layout: fixed;
 	margin-top: 20px;
@@ -65,6 +65,19 @@
 	box-shadow: 0px 5px 5px rgba(0,0,0,0.5);
 }
 
+.pricing-grid .august-promo div {
+	display: inline-block;
+	background-color: #ff611f;
+	padding: 3px 5px;
+	border-radius: 5px;
+	margin-left: -5px;
+	color: #ffffff;
+}
+
+.pricing-grid .august-promo span {
+	text-decoration: line-through;
+}
+
 .pricing-grid td, .pricing-grid th
 {
 	border-bottom: 1px solid #999;
@@ -223,4 +236,18 @@
 {
 	/*text-align: right;*/
 	width: 100%;
-}
+}
+
+#promo-plan-eligible {
+	margin-top: 10px;
+	font-size: 13px;
+	background-color: #ff611f;
+	padding: 3px 5px;
+	border-radius: 5px;
+	color: #ffffff;
+}
+
+.promo-banner {
+	margin-top:10px;
+	background: url('images/august_aweomse_promo_banner.png') no-repeat;
+}

airtime_mvc/public/css/dashboard.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;
 }

airtime_mvc/public/css/styles.css

@@ -862,6 +862,11 @@ dl.inline-list dd {
     color: #ccc;
 }
 
+#recent_uploads_table_wrapper .datatable tr td {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 .datatable tr, .datatable td,
 .dataTable tr, .dataTable td
 {
@@ -3632,9 +3637,13 @@ 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;
+    max-width: 50%;
 }
 
 #sub-menu-wrapper {
@@ -3783,3 +3792,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;
+}