| author | Clipperz <info@clipperz.com> | 2013-01-09 11:28:56 (UTC) |
|---|---|---|
| committer | Clipperz <info@clipperz.com> | 2013-01-09 11:28:56 (UTC) |
| commit | 8ef30d00eb96004c39540019336c0ec99dae01cb (patch) (side-by-side diff) | |
| tree | 781caa5ad46665c581c35f7d4539bfd4e70f9c4a /frontend/beta/css/yui-extensions/basic-dialog.css | |
| parent | 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (diff) | |
| download | clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.zip clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.gz clipperz-8ef30d00eb96004c39540019336c0ec99dae01cb.tar.bz2 | |
Fixed conflict
Diffstat (limited to 'frontend/beta/css/yui-extensions/basic-dialog.css') (more/less context) (show whitespace changes)
| -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 @@ -3,52 +3,49 @@ Copyright 2008-2011 Clipperz Srl This file is part of Clipperz Community Edition. Clipperz Community Edition is an online password manager. For further information about its features and functionalities please refer to http://www.clipperz.com. * Clipperz Community Edition is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. * Clipperz Community Edition is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. * You should have received a copy of the GNU Affero General Public 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;
}
.ydlg-shadow{
background:#aaaaaa;
position:absolute;
left:0;top:0;
}
.ydlg-focus{
-moz-outline:0 none;
outline:0 none;
width:0;
height:0;
overflow:hidden;
position:absolute;
top:0;
left:0;
}
.ydlg-mask{
z-index:10000;
@@ -75,52 +72,49 @@ body.masked .ydlg select { position:absolute;
left:300;top:0;
}
.yresizable-proxy{
z-index:10002;
}
.ydlg .ydlg-hd {
background: url(./images/default/basic-dialog/hd-sprite.gif) repeat-x 0 -82px;
background-color:navy;
color:#ffffff;
font:bold 12px "sans serif", tahoma, verdana, helvetica;
overflow:hidden;
padding:5px;
}
.ydlg .ydlg-hd-left {
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;
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{
overflow:hidden;
}
.ydlg .ydlg-ft{
overflow:hidden;
padding:5px;
padding-bottom:0;
}
.ydlg .yui-ext-tabbody{
background:white;
overflow:auto;
}
.ydlg .ytabs-top .yui-ext-tabbody{
border:1px solid #6593cf;
border-top:0 none;
}
.ydlg .ytabs-bottom .yui-ext-tabbody{
border:1px solid #6593cf;
border-bottom:0 none;
|