Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling

airtime_mvc/public/css/addmedia.css

@@ -1,9 +1,8 @@
 @CHARSET "UTF-8";
 
-#recent_uploads > .dataTables_scrolling
+#recent_uploads .dataTables_scrolling
 {
-	top: 41px;
-	bottom: 8px;
+	top: 0;
 }
 
 #recent_uploads_wrapper
@@ -25,9 +24,10 @@
 	position: absolute;
 	left: 8px;
 	right: 8px;
-	bottom: 0;
-	top: 0;
+	bottom: 8px;
+	top: 41px;
 	border: 1px solid #5b5b5b;
+	overflow-x: hidden;
 }
 
 #recent_uploads_table_wrapper > .fg-toolbar
@@ -288,7 +288,12 @@ table#recent_uploads_table td
 }
 
 #upload_wrapper {
-	height: 100%;
+	/* height: 100%; */
+	position: absolute;
+	top: 8px;
+	bottom: 8px;
+	left: 8px;
+	right: 8px;
 
 	display: -webkit-box;
 	display: -moz-box;
@@ -296,8 +301,7 @@ table#recent_uploads_table td
 	display: -webkit-flex;
 	display: flex;
 	-webkit-flex-flow: column;
-	flex-flow: column;
-}
+	flex-flow: column;}
 
 .dropzone, .dropzone * {
 	box-sizing: border-box

airtime_mvc/public/css/billing.css

@@ -64,19 +64,6 @@
 	color: #000;
 }
 
-.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 #5b5b5b;

airtime_mvc/public/css/dashboard.css

@@ -8,6 +8,7 @@
     box-sizing: border-box;
 
     height: 100%;
+    min-height: 300px;
 
     border: 1px solid #202020;
     border-top: 1px solid #353535;
@@ -22,16 +23,18 @@
 
 @media screen and (max-width: 1600px) {
     #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span,
-    #show_builder button:not(.dropdown-toggle):not(.btn-new) > span {
+    #show_builder button:not(.dropdown-toggle):not(.btn-new) > span,
+    #show_builder #sb_submit > span {
         display: none;
     }
     #library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i,
-    #show_builder button:not(.dropdown-toggle):not(.btn-new) > i {
+    #show_builder button:not(.dropdown-toggle):not(.btn-new) > i,
+    #show_builder #sb_submit > i {
         margin-right: 0 !important;
     }
 }
 
-@media screen and (max-width: 1280px) {
+@media screen and (max-width: 1200px) {
     .wrapper {
         -webkit-flex-flow: column !important;
         flex-flow: column !important;
@@ -150,6 +153,9 @@ div.btn > span {
 #library_empty_image {
     opacity: .3;
 
+    width: 16px;
+    height: 20px;
+
     top: -20px;
     margin-top: -2px;
     padding-right: 2px; /* For the webstream icon */
@@ -158,9 +164,9 @@ div.btn > span {
 #library_empty {
     display: none;
     font-size: 16px;
-    position: absolute;
-    width: 100%;
-    top: 44%;
+    position: fixed;
+    /*width: 100%;*/
+    /*top: 44%;*/
     text-align: center;
     color: #efefef;
 }
@@ -202,9 +208,9 @@ thead th.ui-state-default:focus {
 
 #advanced_search {
     position: absolute;
-    left: -420px;
+    left: -450px;
     padding: 5px;
-    margin-top: -2px;
+    margin-top: 28px;
     z-index: 1005;
 }
 
@@ -229,12 +235,19 @@ thead th.ui-state-default:focus {
     margin-top: 4px;
 }
 
+#filter_message {
+    border-top: none !important;
+    text-shadow: none;
+}
+
 #advanced-options {
     float: right;
     z-index: 1004;
 }
 
 #advanced-options > button {
+    position: absolute;
+    right: 0;
     background: transparent none;
     color: transparent;
     border: none;
@@ -247,6 +260,7 @@ thead th.ui-state-default:focus {
 }
 
 #advanced-options > button > span {
+    color: #000;
     border-top: 4px solid #242424;
 }
 
@@ -456,8 +470,10 @@ li.ui-state-default {
     max-height: 60%;
     overflow-x: hidden;
     width: 100%;
-    flex: 1 0 100%;
+    flex: 1 0 auto;
     padding: 10px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
 
@@ -500,6 +516,8 @@ li.ui-state-default {
     padding: 5px;
     border: 1px solid #444;
     border-radius: 3px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
     background-color: #111;
     display: flex;
@@ -559,6 +577,8 @@ li.ui-state-default {
 }
 
 .side_playlist .zend_form input {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
     height: 26px;
 }
@@ -610,6 +630,7 @@ div.ColVis_collectionBackground {
 
 .ColVis.TableTools > button {
     padding: 3px 9px;
+    margin: -1px -1px 5px 0;
 }
 
 .ColVis_title {

airtime_mvc/public/css/styles.css

@@ -1357,6 +1357,8 @@ input[type="checkbox"] {
 }
 
 #schedule_calendar {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 
     width: 100%;
@@ -1819,6 +1821,8 @@ button, input {
 }
 .user-management .dataTables_filter input {
     width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
     margin-bottom:8px;
 }
@@ -1945,7 +1949,9 @@ div.success{
     float: right;
     height: 30px;
     line-height: 24px;
-    box-sizing: border-box;;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 div.errors, span.errors{
@@ -1957,7 +1963,9 @@ div.errors, span.errors{
     border:1px solid #c83f3f;
     height: 30px;
     line-height: 24px;
-    box-sizing: border-box;;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box;
 }
 
 span.errors.sp-errors{
@@ -2625,6 +2633,8 @@ label span {
 
 fieldset > legend {
     width: 100%;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 
     background: #333;
@@ -3265,6 +3275,9 @@ dd .stream-status {
 
 #add_media_btn {
     width: 100%;
+    font-size: 16px;
+    height: 38px;
+    border-radius: 3px;
 }
 
 .add-show-submit.btn:hover {
@@ -3286,11 +3299,11 @@ dd .stream-status {
 }
 
 .btn-new {
-    background: #237686;
+    background: #246B86;
 }
 .btn-new:active, .btn-new:hover,
 .btn-new[disabled], .btn-new[disabled]:active {
-    background-color: #1c606e;
+    background-color: #185b6e;
 }
 
 .dark_class
@@ -3322,10 +3335,14 @@ dd .stream-status {
     padding-bottom: 5px;
 }
 
-.edit-user-global input, .edit-user-global select {
+.edit-user-global input {
     width: 200px;
 }
 
+.edit-user-global select {
+    width: 212px;
+}
+
 .edit-user-errors {
     margin-left: 33% !important;
     width: 208px;
@@ -3458,9 +3475,15 @@ dd .stream-status {
     min-width: 200px !important;
 }
 
+.calendar-context-menu .context-menu-list {
+    min-width: 260px !important;
+}
+
 /* Add Media Page */
 
 #upload_form, #recent_uploads_wrapper {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
 
@@ -3589,6 +3612,8 @@ button.btn-icon-text > i.icon-white {
 
 .dashboard_sub_nav {
     padding: 0px 0px 0px 10px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
 
@@ -3660,7 +3685,7 @@ button.btn-icon-text > i.icon-white {
     margin-right: 10px;
     height: 100%;
     position:relative;
-    max-width: 50%;
+    /*max-width: 50%;*/
 }
 
 #sub-menu-wrapper {
@@ -3718,6 +3743,8 @@ button.btn-icon-text > i.icon-white {
 #listenerstat_content {
     width: 100%;
     display: block;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
     box-sizing: border-box;
 }
 
@@ -3730,6 +3757,12 @@ button.btn-icon-text > i.icon-white {
     font-size: 12px;
 }
 
+#flot_placeholder.processing {
+    width: 100%;
+    height: 100%;
+    background: url("img/loading.gif") no-repeat 50% 50% rgba(0, 0, 0, .25);
+}
+
 .dashboard-btn {
     width: 50%;
 }