1 files changed, 22 insertions, 14 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css
index 5a9f311..5a6cefb 100644
--- a/frontend/beta/css/yui-extensions/basic-dialog.css
+++ b/frontend/beta/css/yui-extensions/basic-dialog.css
@@ -25,4 +25,8 @@ refer to http://www.clipperz.com.
 .ydlg-proxy {
+<<<<<<< HEAD
+        background-image: url(./images/default/gradient-bg.gif);
+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
        background-color:#c3daf9;
        border:1px solid #6593cf;
@@ -76,5 +80,5 @@ body.masked .ydlg select {
 }
 .ydlg .ydlg-hd {
-        background: url(../images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -82px;
+        background: url(./images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -82px;
        background-color:navy;
        color:#ffffff;
@@ -84,13 +88,17 @@ body.masked .ydlg select {
 }
 .ydlg .ydlg-hd-left {
-        background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px;
+        background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat 0 -41px;
        padding-left:3px;
        margin:0px;
 }
 .ydlg .ydlg-hd-right {
-        background: url(../images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;
+        background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0;
        padding-right:3px;
 }
 .ydlg .ydlg-dlg-body{
+<<<<<<< HEAD
+        background:url(./images/default/layout/gradient-bg.gif);
+=======
+>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
        border:1px solid #6593cf;
        border-top:0 none;
@@ -167,8 +175,8 @@ body.masked .ydlg select {
        cursor:pointer;
        visibility:inherit;
-        background-image:url(../images/default/basic-dialog/close.gif);
+        background-image:url(./images/default/basic-dialog/close.gif);
 }
 .ydlg div.yresizable-handle-east{
-        background-image:url(../images/default/sizer/e-handle-dark.gif);
+        background-image:url(./images/default/sizer/e-handle-dark.gif);
        border:0;
        background-position:left;
@@ -176,27 +184,27 @@ body.masked .ydlg select {
 }
 .ydlg div.yresizable-handle-south{
-        background-image:url(../images/default/sizer/s-handle-dark.gif);
+        background-image:url(./images/default/sizer/s-handle-dark.gif);
        border:0;
        height:6px;
 }
 .ydlg div.yresizable-handle-west{
-        background-image:url(../images/default/sizer/e-handle-dark.gif);
+        background-image:url(./images/default/sizer/e-handle-dark.gif);
        border:0;
        background-position:1px;
 }
 .ydlg div.yresizable-handle-north{
-        background-image:url(../images/default/s.gif);
+        background-image:url(./images/default/s.gif);
        border:0;
 }
 .ydlg div.yresizable-handle-northeast, .ytheme-gray .ydlg div.yresizable-handle-northeast{
-        background-image:url(../images/default/s.gif);
+        background-image:url(./images/default/s.gif);
        border:0;
 }
 .ydlg div.yresizable-handle-northwest, .ytheme-gray .ydlg div.yresizable-handle-northwest{
-        background-image:url(../images/default/s.gif);
+        background-image:url(./images/default/s.gif);
        border:0;
 }
 .ydlg div.yresizable-handle-southeast{
-        background-image:url(../images/default/sizer/corners-sprite.gif);
+        background-image:url(./images/default/sizer/corners-sprite.gif);
        background-position: top left;
        width:8px;
@@ -205,5 +213,5 @@ body.masked .ydlg select {
 }
 .ydlg div.yresizable-handle-southwest{
-        background-image:url(../images/default/sizer/corners-sprite.gif);
+        background-image:url(./images/default/sizer/corners-sprite.gif);
        background-position: top right;
        margin-left:1px;
@@ -236,5 +244,5 @@ body.masked .ydlg select {
 #mb-dlg .ext-mb-progress {
        height:18px;
-        background:transparent url(../images/default/basic-dialog/progress2.gif) repeat-x 1px 1px;
+        background:transparent url(./images/default/basic-dialog/progress2.gif) repeat-x 1px 1px;
 }
 #mb-dlg .ext-mb-progress-bar {
@@ -243,3 +251,3 @@ body.masked .ydlg select {
        width:0;
        background:#8bb8f3;
-}
+}