Consolidated some CSS

airtime_mvc/application/controllers/ShowBuilderController.php

@@ -13,7 +13,7 @@ class ShowBuilderController extends Zend_Controller_Action {
         $this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
         $this->view->headScript()->appendScript(Application_Common_GoogleAnalytics::generateGoogleTagManagerDataLayerJavaScript());
 
-        $this->view->headLink()->appendStylesheet($baseUrl . 'css/redmond/_jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version']);
 
         $this->view->headScript()->appendFile($baseUrl.'js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -31,7 +31,8 @@
             </form>        
         </div>
         <H2><?php echo _("Recent Uploads")?></H2>
-        <table id="recent_uploads_table" class="lib-content ui-widget ui-widget-content block-shadow alpha-block "></table>
+        <table id="recent_uploads_table" class="datatable lib-content ui-widget ui-widget-content block-shadow alpha-block "
+               cellpadding="0" cellspacing="0"></table>
     </div>
     <div style="clear: both;"></div>
 </div>

airtime_mvc/public/css/_showbuilder.css

@@ -101,10 +101,6 @@ div.ColVis_collectionBackground {
     min-width: 555px;
 }
 
-.btn {
-    color: #efefef;
-}
-
 .outer-datatable-wrapper {
     position: relative;
     flex: 1;
@@ -672,7 +668,9 @@ textarea {
 /* ~~~~~~~~~~~~~~~~ */
 
 
-.datatable tr, .datatable td {
+.datatable tr, .datatable td,
+.dataTable tr, .dataTable td
+{
     border: none;
 }
 
@@ -704,55 +702,3 @@ textarea {
     margin: 0;
 }
 
-/* jQuery UI overrides */
-.ui-widget {
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 1.2em;
-}
-.ui-widget .ui-widget {
-    font-size: 1em;
-}
-.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button {
-    font-family: Helvetica, Arial, sans-serif;
-    font-size: 12px;
-}
-.ui-widget-content {
-    border: 1px solid #5b5b5b;
-    background: #aaaaaa url(images/ui-bg_default_aaaaaa.png) repeat-x 0 0;
-    color: #1c1c1c;
-}
-.ui-widget-content a {
-    color: #444444;
-}
-.ui-widget-header {
-    border: 1px solid #5b5b5b;
-    background: #4a4a4a url(images/ui-bg_highlight.png) 0 0 repeat-x;
-    color: #CCC;
-    font-weight: bold;
-}
-.ui-widget-header a {
-    color: #444444;
-}
-
-/* Bootstrap.css overrides */
-.btn {
-    border-color: rgba(0, 0, 0, 0.35) rgba(0, 0, 0, 0.35) rgba(0, 0, 0, 0.55)
-}
-
-/* showbuilder.css overrides */
-.sb-now-playing, tr.sb-now-playing > td {
-    background-color: #1adeff;/* #1aff60; */ /* #5b1aff; */
-    color: #000;
-}
-
-tr.ui-state-error > td {
-    color: #d00000;
-}
-
-tr.ui-state-highlight > td {
-    color: #65a539;
-}
-
-#show_builder_table tr.sb-footer {
-    border-top: 10px solid #000;
-}

airtime_mvc/public/css/bootstrap.css

@@ -116,7 +116,6 @@ a.badge:hover {
   display: inline-block;
   *display: inline;
   /* IE7 inline-block hack */
-
   *zoom: 1;
   padding: 4px 14px;
   margin-bottom: 0;
@@ -126,7 +125,7 @@ a.badge:hover {
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  color: #fff;
+  color: #efefef;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
   background-color: #676767;
   background-image: -moz-linear-gradient(top, #676767, #535353);
@@ -138,14 +137,14 @@ a.badge:hover {
   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#676767', endColorstr='#535353', GradientType=0);
 
   border-color: #5b5b5b #5b5b5b #4f4f4f;
-  border-color: rgba(0, 0, 0, 0.5) rgba(0, 0, 0, 0.5) rgba(0, 0, 0, 0.75);
   *background-color: #676767;
   /* Darken IE7 buttons by default so they stand out more given they won't have borders */
 
   filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
-  border: 1px solid #5b5b5b;
+  border: 1px solid #525252;
+  border-color: rgba(0, 0, 0, 0.35) rgba(0, 0, 0, 0.35) rgba(0, 0, 0, 0.55);
   *border: 0;
-  border-bottom-color: #4f4f4f;
+  border-bottom-color: #323232;
   -webkit-border-radius: 1px;
   -moz-border-radius: 1px;
   border-radius: 1px;
@@ -260,10 +259,6 @@ a.badge:hover {
 .btn-inverse.active {
   color: rgba(255, 255, 255, 0.75);
 }
-.btn {
-  border-color: #c5c5c5;
-  border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
-}
 .btn-primary {
   color: #ffffff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);

airtime_mvc/public/css/redmond/jquery-ui-1.8.8.custom.css

@@ -107,18 +107,26 @@
 	font-size: 12px;
 }
 .ui-widget-content {
-	border: 1px solid #5b5b5b;
+
-	background: #aaaaaa url(images/ui-bg_default_aaaaaa.png) repeat-x 0 0;
+	border: 1px solid #202020;
-	color: #1c1c1c;
+	border-top: 1px solid #353535;
+	border-left: 1px solid #2a2a2a;
+
+	-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
+	-moz-box-shadow: inset 0 0 6px rgba(0,0,0,.65);
+	box-shadow: inset 0 0 6px rgba(0,0,0,.65);
+
+	background-color: #242424;
+	color: #efefef;
+
 }
 .ui-widget-content a {
 	color: #444444;
 }
 .ui-widget-header {
 	border: 1px solid #5b5b5b;
-	background: #4a4a4a url(images/ui-bg_highlight.png) 0 0 repeat-x;
+	background: #4a4a4a ;
-	color: #444444;
+	color: #ccc;
-	font-weight: bold;
 }
 .ui-widget-header a {
 	color: #444444;

airtime_mvc/public/css/showbuilder.css

@@ -287,3 +287,21 @@ table.datatable tr.sb-header.odd:hover td, table.datatable tr.sb-header.even:hov
 .ui-dialog .sb_content .padded {
     padding: 5px 10px 5px 16px;
 }
+
+#show_builder_table tr.sb-footer {
+    border-top: 10px solid #000;
+}
+
+.sb-now-playing, tr.sb-now-playing > td {
+    background-color: #1adeff;/* #1aff60; */ /* #5b1aff; */
+    color: #000;
+}
+
+tr.ui-state-error > td {
+    color: #d00000;
+}
+
+tr.ui-state-highlight > td {
+    color: #65a539;
+}
+

airtime_mvc/public/css/styles.css

@@ -35,7 +35,7 @@ html, body {
 
 
 h2 {
-    color: #000000;
+    color: #efefef;
     font-size: 2.1em;
     font-weight: normal;
     margin: 0;
@@ -787,7 +787,6 @@ input.input_text.sp_extra_input_text{
 
 label {
     font-size:13px;
-    color:#5b5b5b;
     padding:0 16px 0 0;
 }
 .static_text {
@@ -863,6 +862,14 @@ dl.inline-list dd {
     padding: 5px 5px;
     color: #CCC;
 }
+
+.datatable tr, .datatable td,
+.dataTable tr, .dataTable td
+{
+    border: none;
+    border-spacing: 0;
+}
+
 .odd {
     background-color: #282828;
 }
@@ -924,7 +931,6 @@ dl.inline-list dd {
 .dataTables_length label {
     padding:0;
     font-size:12px;
-    color:#404040;
     line-height:24px;
 }
 .dataTables_filter {

airtime_mvc/public/js/airtime/library/plupload.js

@@ -111,7 +111,7 @@ $(document).ready(function() {
 			//"sScrollY": "200px",
 			"bFilter": false,
 			"bSort": false,
-			"sDom": '<"H"l>frtip',
+			"sDom": '<"H">frtip<"F"l>',
 			"bPaginate" : true,
             "sPaginationType": "full_numbers",
 			"aoColumns": [