Diffstat (limited to 'frontend/beta/css/yui-extensions') (more/less context) (ignore whitespace changes)
-rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css index 2b1e20c..5a6cefb 100644 --- a/frontend/beta/css/yui-extensions/basic-dialog.css +++ b/frontend/beta/css/yui-extensions/basic-dialog.css | |||
@@ -25,5 +25,8 @@ refer to http://www.clipperz.com. | |||
25 | 25 | ||
26 | .ydlg-proxy { | 26 | .ydlg-proxy { |
27 | <<<<<<< HEAD | ||
27 | background-image: url(./images/default/gradient-bg.gif); | 28 | background-image: url(./images/default/gradient-bg.gif); |
29 | ======= | ||
30 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
28 | background-color:#c3daf9; | 31 | background-color:#c3daf9; |
29 | border:1px solid #6593cf; | 32 | border:1px solid #6593cf; |
@@ -94,5 +97,8 @@ body.masked .ydlg select { | |||
94 | } | 97 | } |
95 | .ydlg .ydlg-dlg-body{ | 98 | .ydlg .ydlg-dlg-body{ |
99 | <<<<<<< HEAD | ||
96 | background:url(./images/default/layout/gradient-bg.gif); | 100 | background:url(./images/default/layout/gradient-bg.gif); |
101 | ======= | ||
102 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
97 | border:1px solid #6593cf; | 103 | border:1px solid #6593cf; |
98 | border-top:0 none; | 104 | border-top:0 none; |