-rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css index 5a6cefb..2b1e20c 100644 --- a/frontend/beta/css/yui-extensions/basic-dialog.css +++ b/frontend/beta/css/yui-extensions/basic-dialog.css | |||
@@ -23,12 +23,9 @@ refer to http://www.clipperz.com. | |||
23 | 23 | ||
24 | */ | 24 | */ |
25 | 25 | ||
26 | .ydlg-proxy { | 26 | .ydlg-proxy { |
27 | <<<<<<< HEAD | ||
28 | background-image: url(./images/default/gradient-bg.gif); | 27 | background-image: url(./images/default/gradient-bg.gif); |
29 | ======= | ||
30 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
31 | background-color:#c3daf9; | 28 | background-color:#c3daf9; |
32 | border:1px solid #6593cf; | 29 | border:1px solid #6593cf; |
33 | z-index:10001; | 30 | z-index:10001; |
34 | overflow:hidden; | 31 | overflow:hidden; |
@@ -95,12 +92,9 @@ body.masked .ydlg select { | |||
95 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; | 92 | background: url(./images/default/basic-dialog/hd-sprite.gif) no-repeat right 0; |
96 | padding-right:3px; | 93 | padding-right:3px; |
97 | } | 94 | } |
98 | .ydlg .ydlg-dlg-body{ | 95 | .ydlg .ydlg-dlg-body{ |
99 | <<<<<<< HEAD | ||
100 | background:url(./images/default/layout/gradient-bg.gif); | 96 | background:url(./images/default/layout/gradient-bg.gif); |
101 | ======= | ||
102 | >>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 | ||
103 | border:1px solid #6593cf; | 97 | border:1px solid #6593cf; |
104 | border-top:0 none; | 98 | border-top:0 none; |
105 | padding:10px; | 99 | padding:10px; |
106 | overflow:hidden; | 100 | overflow:hidden; |