summaryrefslogtreecommitdiff
path: root/frontend
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) (side-by-side diff)
tree781caa5ad46665c581c35f7d4539bfd4e70f9c4a /frontend
parent6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (diff)
downloadclipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.zip
clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.gz
clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.bz2
Fixed conflict
Diffstat (limited to 'frontend') (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.
License along with Clipperz Community Edition. If not, see
<http://www.gnu.org/licenses/>.
*/
.ydlg-proxy {
-<<<<<<< HEAD
background-image: url(./images/default/gradient-bg.gif);
-=======
->>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
background-color:#c3daf9;
border:1px solid #6593cf;
z-index:10001;
overflow:hidden;
position:absolute;
left:0;top:0;
@@ -93,16 +90,13 @@ body.masked .ydlg select {
}
.ydlg .ydlg-hd-right {
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;
padding:10px;
overflow:hidden;
}
.ydlg .ydlg-bd{