From 2aa1ab2f2b4479846553dc20d8fe44ea221a6cd3 Mon Sep 17 00:00:00 2001
From: Calum Lind <calumlind+deluge@gmail.com>
Date: Mon, 16 May 2016 12:32:41 +0100
Subject: [PATCH] [WebUI] Revert broken refactor of theme css

By combining the background-* css styles into background it overrides background
settings in ext-all-notheme.css resulting in incorrect placement of grid header gif.
---
 deluge/ui/web/themes/css/xtheme-access.css |  88 +++++++++++------
 deluge/ui/web/themes/css/xtheme-blue.css   | 107 ++++++++++++++-------
 deluge/ui/web/themes/css/xtheme-gray.css   |  99 ++++++++++++-------
 3 files changed, 195 insertions(+), 99 deletions(-)

diff --git a/deluge/ui/web/themes/css/xtheme-access.css b/deluge/ui/web/themes/css/xtheme-access.css
index 4ce0a6e69..7a091abb6 100644
--- a/deluge/ui/web/themes/css/xtheme-access.css
+++ b/deluge/ui/web/themes/css/xtheme-access.css
@@ -15,7 +15,8 @@ body {
 
 .ext-el-mask-msg {
     border-color:#223;
-    background: #3f4757 url(../images/access/box/tb-blue.gif);
+    background-color:#3f4757;
+    background-image:url(../images/access/box/tb-blue.gif);
 }
 .ext-el-mask-msg div {
     background-color: #232d38;
@@ -25,7 +26,8 @@ body {
 }
 
 .x-mask-loading div {
-    background: #232d38 url(../images/access/grid/loading.gif);
+    background-color:#232d38;
+    background-image:url(../images/access/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -88,12 +90,14 @@ body {
 }
 
 ul.x-tab-strip-top{
-    background: #343843 url(../images/access/tabs/tab-strip-bg.gif);
+    background-color:#343843;
+    background-image: url(../images/access/tabs/tab-strip-bg.gif);
     border-bottom-color:#343d4e;
 }
 
 ul.x-tab-strip-bottom{
-    background: #343843 url(../images/access/tabs/tab-strip-btm-bg.gif);
+    background-color:#343843;
+    background-image: url(../images/access/tabs/tab-strip-btm-bg.gif);
     border-top-color:#343843;
 }
 
@@ -193,8 +197,10 @@ ul.x-tab-strip-bottom{
 
 .x-form-text, textarea.x-form-field{
     color: #ffffff;
-    background: #33373d url(../images/access/form/text-bg.gif);
-    border: 2px #737b8c;
+    background-color:#33373d;
+    background-image:url(../images/access/form/text-bg.gif);
+    border-color:#737b8c;
+    border-width:2px;
 }
 
 .ext-webkit .x-form-text, .ext-webkit textarea.x-form-field{
@@ -225,7 +231,8 @@ ul.x-tab-strip-bottom{
 
 .x-form-field-wrap .x-form-trigger{
     background-image:url(../images/access/form/trigger.gif);
-    border-bottom: 2px #737b8c;
+    border-bottom-color:#737b8c;
+    border-bottom-width:2px;
     height:24px;
     width:20px;
 }
@@ -292,7 +299,8 @@ ul.x-tab-strip-bottom{
 
 .x-form-invalid, textarea.x-form-invalid,
 .ext-webkit .x-form-invalid, .ext-webkit textarea.x-form-invalid{
-    background: #15171a url(../images/access/grid/invalid_line.gif);
+    background-color:#15171a;
+    background-image:url(../images/access/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -304,7 +312,8 @@ ul.x-tab-strip-bottom{
 */
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid{
-    background: #fff url(../images/access/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/access/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -338,9 +347,10 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid-icon {
+    background-image:url(../images/access/form/exclamation.gif);
     height:25px;
     width:19px;
-    background: url(../images/access/form/exclamation.gif) center right;
+    background-position:center right;
 }
 
 .x-fieldset {
@@ -483,7 +493,8 @@ ul.x-tab-strip-bottom{
 }
 .x-toolbar{
     border-color:#18181a;
-    background: #393d4e url(../images/access/toolbar/bg.gif);
+    background-color:#393d4e;
+    background-image:url(../images/access/toolbar/bg.gif);
 }
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
@@ -650,7 +661,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background: #fff url(../images/default/shared/loading-balls.gif);
+    background-color: #fff;
+    background-image:url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -676,7 +688,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background: #3b3f50 url(../images/access/grid/grid3-hrow.gif);
+    background-color:#3b3f50;
+    background-image:url(../images/access/grid/grid3-hrow.gif);
 }
 
 .x-grid3-header-pop {
@@ -694,7 +707,8 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background: #4e628a url(../images/access/grid/grid3-hrow-over.gif);
+    background-color:#4e628a;
+    background-image:url(../images/access/grid/grid3-hrow-over.gif);
 }
 
 .x-grid3-cell-inner, .x-grid3-hd-inner {
@@ -728,7 +742,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background: #ebf3fd url(../images/access/grid/grid3-hrow-over.gif);
+    background-color:#ebf3fd;
+    background-image:url(../images/access/grid/grid3-hrow-over.gif);
     border-color:#aaccf6;
 }
 
@@ -764,7 +779,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
+    background-color:#ebeadb !important;
+    background-image:url(../images/default/grid/grid-hrow.gif) !important;
     color:#fff;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -816,7 +832,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-hd-btn {
-    background: #c2c9d0 url(../images/access/grid/grid3-hd-btn.gif);
+    background-color:#c2c9d0;
+    background-image:url(../images/access/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -870,7 +887,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid-group-hd div.x-grid-group-title {
-    background: url(../images/access/grid/group-collapse.gif) 3px 6px;
+    background-image:url(../images/access/grid/group-collapse.gif);
+    background-position:3px 6px;
     color:#ffd;
     font:bold 14px tahoma, arial, helvetica, sans-serif;
 }
@@ -1117,7 +1135,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner th {
-    background: #363d4a url(../images/access/toolbar/bg.gif);
+    background-color:#363d4a;
+    background-image:url(../images/access/toolbar/bg.gif);
     border-bottom-color:#535b5c;
     font:normal 13px arial, helvetica,tahoma,sans-serif;
     color:#fff;
@@ -1138,7 +1157,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner .x-date-selected a{
-    background: #e5872c none;
+    background-color:#e5872c;
+    background-image:none;
     border-color:#864900;
     padding:1px 6px 1px 2px; /* Structure to account for larger, bolder fonts in Access theme. */
 }
@@ -1157,7 +1177,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-date-bottom {
     border-top-color:#737b8c;
-    background: #464d5a url(../images/access/shared/glass-bg.gif);
+    background-color:#464d5a;
+    background-image:url(../images/access/shared/glass-bg.gif);
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1195,7 +1216,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-mp-btns {
-    background: #dfecfb url(../images/access/shared/glass-bg.gif);
+    background-color: #dfecfb;
+    background-image: url(../images/access/shared/glass-bg.gif);
 }
 
 .x-date-mp-btns td {
@@ -1212,7 +1234,8 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background: #e5872c none;
+    background-color: #e5872c;
+    background-image: none;
     border-color:#864900;
 }
 
@@ -1263,7 +1286,8 @@ td.x-date-mp-sep {
 }
 .x-menu {
     border-color:#222;
-    background: #414551 url(../images/access/menu/menu.gif);
+    background-color:#414551;
+    background-image:url(../images/access/menu/menu.gif);
 }
 
 .x-menu-nosep {
@@ -1288,7 +1312,8 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background: #f09134 none;
+    background-color: #f09134;
+    background-image: none;
     border-color:#b36427;
 }
 
@@ -1349,7 +1374,8 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background: #eee url(../images/default/box/tb.gif);
+    background-color: #eee;
+    background-image: url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 15px;
@@ -1688,11 +1714,13 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background: #232d38 none;
+    background-color:#232d38;
+    background-image:none;
 }
 
 .x-progress-bar {
-    background: #f39a00 url(../images/access/progress/progress-bg.gif);
+    background-color:#f39a00;
+    background-image:url(../images/access/progress/progress-bg.gif);
     border-top-color:#a66900;
     border-bottom-color:#a66900;
     border-right-color:#ffb941;
@@ -1711,7 +1739,9 @@ body.x-body-masked .x-window-plain .x-window-mc {
     line-height: 19px;
 }
 .x-list-header{
-    background: #393d4e url(../images/access/toolbar/bg.gif) 0 top;
+    background-color:#393d4e;
+    background-image:url(../images/access/toolbar/bg.gif);
+    background-position:0 top;
 }
 
 .x-list-header-inner div em {
diff --git a/deluge/ui/web/themes/css/xtheme-blue.css b/deluge/ui/web/themes/css/xtheme-blue.css
index edce8b51a..8c9891ecc 100644
--- a/deluge/ui/web/themes/css/xtheme-blue.css
+++ b/deluge/ui/web/themes/css/xtheme-blue.css
@@ -10,7 +10,8 @@
 
 .ext-el-mask-msg {
     border-color:#6593cf;
-    background: #c3daf9 url(../images/default/box/tb-blue.gif);
+    background-color:#c3daf9;
+    background-image:url(../images/default/box/tb-blue.gif);
 }
 .ext-el-mask-msg div {
     background-color: #eee;
@@ -20,7 +21,8 @@
 }
 
 .x-mask-loading div {
-    background: #fbfbfb url(../images/default/grid/loading.gif);
+    background-color:#fbfbfb;
+    background-image:url(../images/default/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -90,12 +92,14 @@
 }
 
 ul.x-tab-strip-top{
-    background: #cedff5 url(../images/default/tabs/tab-strip-bg.gif);
+    background-color:#cedff5;
+    background-image: url(../images/default/tabs/tab-strip-bg.gif);
     border-bottom-color:#8db2e3;
 }
 
 ul.x-tab-strip-bottom{
-    background: #cedff5 url(../images/default/tabs/tab-strip-btm-bg.gif);
+    background-color:#cedff5;
+    background-image: url(../images/default/tabs/tab-strip-btm-bg.gif);
     border-top-color:#8db2e3;
 }
 
@@ -201,7 +205,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-text, textarea.x-form-field {
-    background: #fff url(../images/default/form/text-bg.gif);
+    background-color:#fff;
+    background-image:url(../images/default/form/text-bg.gif);
     border-color:#b5b8c8;
 }
 
@@ -253,7 +258,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid, textarea.x-form-invalid {
-    background: #fff url(../images/default/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -263,12 +269,14 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid.x-form-composite .x-form-invalid {
-    background: #fff url(../images/default/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid {
-    background: #fff url(../images/default/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/default/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -398,8 +406,9 @@ ul.x-tab-strip-bottom{
     background-image: url(../images/default/button/group-tb.gif);
 }.x-toolbar{
     border-color:#a9bfd3;
-     background: #d0def0 url(../images/default/toolbar/bg.gif);
- }
+    background-color:#d0def0;
+    background-image:url(../images/default/toolbar/bg.gif);
+}
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
     font:normal 11px arial,tahoma, helvetica, sans-serif;
@@ -543,7 +552,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background: #fff url(../images/default/shared/loading-balls.gif);
+    background-color: #fff;
+    background-image:url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -557,7 +567,8 @@ ul.x-tab-strip-bottom{
 
 .x-grid3-row-over {
     border-color:#ddd;
-    background: #efefef url(../images/default/grid/row-over.gif);
+    background-color:#efefef;
+    background-image:url(../images/default/grid/row-over.gif);
 }
 
 .x-grid3-resize-proxy {
@@ -569,7 +580,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background: #f9f9f9 url(../images/default/grid/grid3-hrow.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/default/grid/grid3-hrow.gif);
 }
 
 .x-grid3-header-pop {
@@ -587,7 +599,8 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background: #ebf3fd url(../images/default/grid/grid3-hrow-over.gif);
+    background-color:#ebf3fd;
+    background-image:url(../images/default/grid/grid3-hrow-over.gif);
 
 }
 
@@ -612,7 +625,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background: #ebf3fd url(../images/default/grid/grid3-hrow-over.gif);
+    background-color:#ebf3fd;
+    background-image:url(../images/default/grid/grid3-hrow-over.gif);
     border-color:#aaccf6;
 }
 
@@ -648,7 +662,8 @@ td.grid-hd-group-cell {
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
+    background-color:#ebeadb !important;
+    background-image:url(../images/default/grid/grid-hrow.gif) !important;
     color:#000;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -697,7 +712,8 @@ td.grid-hd-group-cell {
 }
 
 .x-grid3-hd-btn {
-    background: #c3daf9 url(../images/default/grid/grid3-hd-btn.gif);
+    background-color:#c3daf9;
+    background-image:url(../images/default/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -785,9 +801,11 @@ td.grid-hd-group-cell {
     border-top-color:#a3bae9;
 }.x-pivotgrid .x-grid3-header-offset table td {
     background: url(../images/default/grid/grid3-hrow.gif) repeat-x 50% 100%;
-     border-right: 1px solid #D0D0D0;
-     border-left: 1px solid #EEE;
- }
+    border-left: 1px solid;
+    border-right: 1px solid;
+    border-left-color: #EEE;
+    border-right-color: #D0D0D0;
+}
 
 .x-pivotgrid .x-grid3-row-headers {
     background-color: #f9f9f9;
@@ -795,9 +813,12 @@ td.grid-hd-group-cell {
 
 .x-pivotgrid .x-grid3-row-headers table td {
     background: #EEE url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
-    border-right: 1px solid #D0D0D0;
-    border-bottom: 1px solid #D0D0D0;
-    border-left: 1px solid #EEE;
+    border-left: 1px solid;
+    border-right: 1px solid;
+    border-left-color: #EEE;
+    border-right-color: #D0D0D0;
+    border-bottom: 1px solid;
+    border-bottom-color: #D0D0D0;
     height: 18px;
 }
 .x-dd-drag-ghost{
@@ -995,7 +1016,8 @@ td.grid-hd-group-cell {
 }
 
 .x-date-inner th {
-    background: #dfecfb url(../images/default/shared/glass-bg.gif);
+    background-color:#dfecfb;
+    background-image:url(../images/default/shared/glass-bg.gif);
     border-bottom-color:#a3bad9;
     font:normal 10px arial, helvetica,tahoma,sans-serif;
     color:#233d6d;
@@ -1015,7 +1037,8 @@ td.grid-hd-group-cell {
 }
 
 .x-date-inner .x-date-selected a{
-    background: #dfecfb url(../images/default/shared/glass-bg.gif);
+    background-color:#dfecfb;
+    background-image:url(../images/default/shared/glass-bg.gif);
     border-color:#8db2e3;
 }
 
@@ -1033,7 +1056,8 @@ td.grid-hd-group-cell {
 
 .x-date-bottom {
     border-top-color:#a3bad9;
-    background: #dfecfb url(../images/default/shared/glass-bg.gif);
+    background-color:#dfecfb;
+    background-image:url(../images/default/shared/glass-bg.gif);
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1071,7 +1095,8 @@ td.grid-hd-group-cell {
 }
 
 .x-date-mp-btns {
-    background: #dfecfb url(../images/default/shared/glass-bg.gif);
+    background-color: #dfecfb;
+    background-image: url(../images/default/shared/glass-bg.gif);
 }
 
 .x-date-mp-btns td {
@@ -1088,7 +1113,8 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background: #dfecfb url(../images/default/shared/glass-bg.gif);
+    background-color: #dfecfb;
+    background-image: url(../images/default/shared/glass-bg.gif);
     border-color:#8db2e3;
 }
 
@@ -1136,8 +1162,9 @@ td.x-date-mp-sep {
 .x-tip-anchor {
     background-image:url(../images/default/qtip/tip-anchor-sprite.gif);
 }.x-menu {
-     background: #f0f0f0 url(../images/default/menu/menu.gif);
- }
+    background-color:#f0f0f0;
+    background-image:url(../images/default/menu/menu.gif);
+}
 
 .x-menu-floating{
     border-color:#718bb7;
@@ -1165,7 +1192,8 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background: #dbecf4 url(../images/default/menu/item-over.gif);
+    background-image: url(../images/default/menu/item-over.gif);
+    background-color: #dbecf4;
     border-color:#aaccf6;
 }
 
@@ -1231,7 +1259,8 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background: #eee url(../images/default/box/tb.gif);
+    background-color: #eee;
+    background-image: url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 12px;
@@ -1370,7 +1399,8 @@ a.x-menu-item {
 }
 
 .x-panel-ml {
-    background: #fff url(../images/default/panel/left-right.gif);
+    background-color: #fff;
+    background-image:url(../images/default/panel/left-right.gif);
 }
 
 .x-panel-mr {
@@ -1550,11 +1580,13 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background: #e0e8f3 url(../images/default/qtip/bg.gif);
+    background-color:#e0e8f3;
+    background-image:url(../images/default/qtip/bg.gif);
 }
 
 .x-progress-bar {
-    background: #9cbfee url(../images/default/progress/progress-bg.gif);
+    background-color:#9cbfee;
+    background-image:url(../images/default/progress/progress-bg.gif);
     border-top-color:#d1e4fd;
     border-bottom-color:#7fa9e4;
     border-right-color:#7fa9e4;
@@ -1569,8 +1601,9 @@ body.x-body-masked .x-window-plain .x-window-mc {
 .x-progress-text-back {
     color:#396095;
 }.x-list-header{
-     background: #f9f9f9 url(../images/default/grid/grid3-hrow.gif);
- }
+    background-color:#f9f9f9;
+    background-image:url(../images/default/grid/grid3-hrow.gif);
+}
 
 .x-list-header-inner div em {
     border-left-color:#ddd;
diff --git a/deluge/ui/web/themes/css/xtheme-gray.css b/deluge/ui/web/themes/css/xtheme-gray.css
index 6d957785f..923fdc5d8 100644
--- a/deluge/ui/web/themes/css/xtheme-gray.css
+++ b/deluge/ui/web/themes/css/xtheme-gray.css
@@ -10,7 +10,9 @@
 
 .ext-el-mask-msg {
     border-color:#999;
-    background: #ddd url(../images/gray/panel/white-top-bottom.gif) 0 -1px;
+    background-color:#ddd;
+    background-image:url(../images/gray/panel/white-top-bottom.gif);
+    background-position: 0 -1px;
 }
 .ext-el-mask-msg div {
     background-color: #eee;
@@ -20,7 +22,8 @@
 }
 
 .x-mask-loading div {
-    background: #fbfbfb url(../images/default/grid/loading.gif);
+    background-color:#fbfbfb;
+    background-image:url(../images/default/grid/loading.gif);
 }
 
 .x-item-disabled {
@@ -89,12 +92,14 @@
 }
 
 ul.x-tab-strip-top{
-    background: #dbdbdb url(../images/gray/tabs/tab-strip-bg.gif);
+    background-color:#dbdbdb;
+    background-image: url(../images/gray/tabs/tab-strip-bg.gif);
     border-bottom-color:#d0d0d0;
 }
 
 ul.x-tab-strip-bottom{
-    background: #dbdbdb url(../images/gray/tabs/tab-strip-btm-bg.gif);
+    background-color:#dbdbdb;
+    background-image: url(../images/gray/tabs/tab-strip-btm-bg.gif);
     border-top-color:#d0d0d0;
 }
 
@@ -201,7 +206,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-text, textarea.x-form-field{
-    background: #fff url(../images/default/form/text-bg.gif);
+    background-color:#fff;
+    background-image:url(../images/default/form/text-bg.gif);
     border-color:#C1C1C1;
 }
 
@@ -253,7 +259,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-invalid, textarea.x-form-invalid{
-    background: #fff url(../images/default/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/default/grid/invalid_line.gif);
     border-color:#c30;
 }
 
@@ -263,7 +270,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-form-inner-invalid, textarea.x-form-inner-invalid{
-    background: #fff url(../images/default/grid/invalid_line.gif);
+    background-color:#fff;
+    background-image:url(../images/default/grid/invalid_line.gif);
 }
 
 .x-form-grow-sizer {
@@ -393,7 +401,8 @@ ul.x-tab-strip-bottom{
 }
 .x-toolbar{
     border-color:#d0d0d0;
-    background: #f0f0f0 url(../images/gray/toolbar/bg.gif);
+    background-color:#f0f0f0;
+    background-image:url(../images/gray/toolbar/bg.gif);
 }
 
 .x-toolbar td,.x-toolbar span,.x-toolbar input,.x-toolbar div,.x-toolbar select,.x-toolbar label{
@@ -538,7 +547,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid-row-loading {
-    background: #fff url(../images/default/shared/loading-balls.gif);
+    background-color: #fff;
+    background-image:url(../images/default/shared/loading-balls.gif);
 }
 
 .x-grid3-row {
@@ -552,7 +562,8 @@ ul.x-tab-strip-bottom{
 
 .x-grid3-row-over {
     border-color:#ddd;
-    background: #efefef url(../images/default/grid/row-over.gif);
+    background-color:#efefef;
+    background-image:url(../images/default/grid/row-over.gif);
 }
 
 .x-grid3-resize-proxy {
@@ -564,7 +575,8 @@ ul.x-tab-strip-bottom{
 }
 
 .x-grid3-header{
-    background: #f9f9f9 url(../images/gray/grid/grid3-hrow2.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-grid3-header-pop {
@@ -582,7 +594,8 @@ td.x-grid3-hd-over, td.sort-desc, td.sort-asc, td.x-grid3-hd-menu-open {
 }
 
 td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-asc .x-grid3-hd-inner, td.x-grid3-hd-menu-open .x-grid3-hd-inner {
-    background: #f9f9f9 url(../images/gray/grid/grid3-hrow-over2.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
 
 }
 
@@ -607,7 +620,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-dd-drag-proxy .x-grid3-hd-inner{
-    background: #f9f9f9 url(../images/gray/grid/grid3-hrow-over2.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hrow-over2.gif);
     border-color:#ACACAC;
 }
 
@@ -639,7 +653,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-locked td.x-grid3-row-marker, .x-grid3-locked .x-grid3-row-selected td.x-grid3-row-marker{
-    background: #ebeadb url(../images/default/grid/grid-hrow.gif) !important;
+    background-color:#ebeadb !important;
+    background-image:url(../images/default/grid/grid-hrow.gif) !important;
     color:#000;
     border-top-color:#fff;
     border-right-color:#6fa0df !important;
@@ -688,7 +703,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-grid3-hd-btn {
-    background: #f9f9f9 url(../images/gray/grid/grid3-hd-btn.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hd-btn.gif);
 }
 
 .x-grid3-body .x-grid3-td-expander {
@@ -781,8 +797,10 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 .x-pivotgrid .x-grid3-header-offset table td {
     background: url(../images/gray/grid/grid3-hrow2.gif) repeat-x 50% 100%;
-    border-right: 1px solid #D0D0D0;
-    border-left: 1px solid #D0D0D0;
+    border-left: 1px solid;
+    border-right: 1px solid;
+    border-left-color: #D0D0D0;
+    border-right-color: #D0D0D0;
 }
 
 .x-pivotgrid .x-grid3-row-headers {
@@ -791,9 +809,12 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-pivotgrid .x-grid3-row-headers table td {
     background: #EEE url(../images/default/grid/grid3-rowheader.gif) repeat-x left top;
-    border-right: 1px solid #D0D0D0;
-    border-bottom: 1px solid #D0D0D0;
-    border-left: 1px solid #EEE;
+    border-left: 1px solid;
+    border-right: 1px solid;
+    border-left-color: #EEE;
+    border-right-color: #D0D0D0;
+    border-bottom: 1px solid;
+    border-bottom-color: #D0D0D0;
     height: 18px;
 }
 .x-dd-drag-ghost{
@@ -997,7 +1018,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner th {
-    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif);
+    background-color:#D8D8D8;
+    background-image: url(../images/gray/panel/white-top-bottom.gif);
     border-bottom-color:#AFAFAF;
     font:normal 10px arial, helvetica,tahoma,sans-serif;
     color:#595959;
@@ -1017,7 +1039,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-inner .x-date-selected a{
-    background: #D8D8D8 none;
+    background-image: none;
+    background-color:#D8D8D8;
     border-color:#DCDCDC;
 }
 
@@ -1035,7 +1058,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 
 .x-date-bottom {
     border-top-color:#AFAFAF;
-    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-inner a:hover, .x-date-inner .x-date-disabled a:hover{
@@ -1073,7 +1097,8 @@ td.x-grid3-hd-over .x-grid3-hd-inner, td.sort-desc .x-grid3-hd-inner, td.sort-as
 }
 
 .x-date-mp-btns {
-    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
 }
 
 .x-date-mp-btns td {
@@ -1090,7 +1115,8 @@ td.x-date-mp-month a:hover,td.x-date-mp-year a:hover {
 }
 
 td.x-date-mp-sel a {
-    background: #D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
+    background-color:#D8D8D8;
+    background:#D8D8D8 url(../images/gray/panel/white-top-bottom.gif) 0 -2px;
     border-color:#DCDCDC;
 }
 
@@ -1138,8 +1164,9 @@ td.x-date-mp-sep {
 .x-tip-anchor {
     background-image:url(../images/gray/qtip/tip-anchor-sprite.gif);
 }.x-menu {
-     background: #f0f0f0 url(../images/default/menu/menu.gif);
- }
+    background-color:#f0f0f0;
+    background-image:url(../images/default/menu/menu.gif);
+}
 
 .x-menu-floating{
     border-color:#7D7D7D;
@@ -1167,7 +1194,8 @@ a.x-menu-item {
 }
 
 .x-menu-item-active {
-    background: #f1f1f1 url(../images/gray/menu/item-over.gif);
+    background-image: url(../images/gray/menu/item-over.gif);
+    background-color: #f1f1f1;
     border-color:#ACACAC;
 }
 
@@ -1227,7 +1255,8 @@ a.x-menu-item {
 }
 
 .x-box-mc {
-    background: #eee url(../images/default/box/tb.gif);
+    background-color: #eee;
+    background-image: url(../images/default/box/tb.gif);
     font-family: "Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;
     color: #393939;
     font-size: 12px;
@@ -1367,7 +1396,8 @@ a.x-menu-item {
 }
 
 .x-panel-ml {
-    background: #fff url(../images/gray/panel/left-right.gif);
+    background-color: #fff;
+    background-image:url(../images/gray/panel/left-right.gif);
 }
 
 .x-panel-mr {
@@ -1555,11 +1585,13 @@ body.x-body-masked .x-window-plain .x-window-mc {
 }
 
 .x-progress-inner {
-    background: #E7E7E7 url(../images/gray/qtip/bg.gif);
+    background-color:#E7E7E7;
+    background-image:url(../images/gray/qtip/bg.gif);
 }
 
 .x-progress-bar {
-    background: #BCBCBC url(../images/gray/progress/progress-bg.gif);
+    background-color:#BCBCBC;
+    background-image:url(../images/gray/progress/progress-bg.gif);
     border-top-color:#E2E2E2;
     border-bottom-color:#A4A4A4;
     border-right-color:#A4A4A4;
@@ -1575,7 +1607,8 @@ body.x-body-masked .x-window-plain .x-window-mc {
     color:#5F5F5F;
 }
 .x-list-header{
-    background: #f9f9f9 url(../images/gray/grid/grid3-hrow2.gif);
+    background-color:#f9f9f9;
+    background-image:url(../images/gray/grid/grid3-hrow2.gif);
 }
 
 .x-list-header-inner div em {