clipperz/password-manager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed conflict

Browse Source
This commit is contained in:
Clipperz 2013-01-09 12:28:56 +01:00
parent 6cfcbb8dee
commit 8ef30d00eb
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/beta/css/yui-extensions/basic-dialog.css
View File

@ -24,10 +24,7 @@ refer to http://www.clipperz.com.
*/
.ydlg-proxy {
<<<<<<< HEAD
background-image: url(./images/default/gradient-bg.gif);
=======
>>>>>>> 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9
background-color:#c3daf9;
border:1px solid #6593cf;
z-index:10001;
@ -96,10 +93,7 @@ body.masked .ydlg select {
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;