| author | Clipperz <info@clipperz.com> | 2013-01-09 11:24:13 (UTC) |
|---|---|---|
| committer | Clipperz <info@clipperz.com> | 2013-01-09 11:24:13 (UTC) |
| commit | 6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57 (patch) (side-by-side diff) | |
| tree | ae7ed58da6d0f4ce64b7ae4a4ba3f7b1519471d3 /frontend/beta/css | |
| parent | f6903b9a5670370ef742a02092ab72e4227ddcd9 (diff) | |
| parent | 0db1d5c8b18eadc4bd9cfc6603e86227fa94b5a9 (diff) | |
| download | clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.zip clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.gz clipperz-6cfcbb8deeb99b0b88f5ce3b34a5c9aa1877dc57.tar.bz2 | |
Merge branch 'master' of github.com:clipperz/password-manager
Conflicts:
frontend/beta/css/yui-extensions/basic-dialog.css
| -rw-r--r-- | frontend/beta/css/yui-extensions/basic-dialog.css | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/frontend/beta/css/yui-extensions/basic-dialog.css b/frontend/beta/css/yui-extensions/basic-dialog.css index 2b1e20c..5a6cefb 100644 --- a/frontend/beta/css/yui-extensions/basic-dialog.css +++ b/frontend/beta/css/yui-extensions/basic-dialog.css @@ -24,7 +24,10 @@ 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;
@@ -93,7 +96,10 @@ 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;
|