summaryrefslogtreecommitdiff
authorClipperz <info@clipperz.com>2013-01-09 11:28:56 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 11:28:56 (UTC)
commit8ef30d00eb96004c39540019336c0ec99dae01cb (patch) (unidiff)
tree781caa5ad46665c581c35f7d4539bfd4e70f9c4a
parent6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (diff)
downloadclipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.zip
clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.gz
clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.bz2
Fixed conflict
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/css/yui-extensions/basic-dialog.css6
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
@@ -21,16 +21,13 @@ refer to http://www.clipperz.com.
21 License along with Clipperz Community Edition. If not, see 21 License along with Clipperz Community Edition. If not, see
22 <http://www.gnu.org/licenses/>. 22 <http://www.gnu.org/licenses/>.
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;
35 position:absolute; 32 position:absolute;
36 left:0;top:0; 33 left:0;top:0;
@@ -93,16 +90,13 @@ body.masked .ydlg select {
93} 90}
94.ydlg .ydlg-hd-right { 91.ydlg .ydlg-hd-right {
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;
107} 101}
108.ydlg .ydlg-bd{ 102.ydlg .ydlg-bd{