Merge branch 'master' of https://github.com/roundcube/roundcubemail

Conflicts:
	plugins/password/config.inc.php.dist

1 files changed, 0 insertions, 9 deletions

diff --git a/program/js/tiny_mce/plugins/xhtmlxtras/css/popup.css b/program/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
deleted file mode 100644
index e67114dba..000000000
--- a/program/js/tiny_mce/plugins/xhtmlxtras/css/popup.css
+++ /dev/null
@@ -1,9 +0,0 @@
-input.field, select.field {width:200px;}

-input.picker {width:179px; margin-left: 5px;}

-input.disabled {border-color:#F2F2F2;}

-img.picker {vertical-align:text-bottom; cursor:pointer;}

-h1 {padding: 0 0 5px 0;}

-.panel_wrapper div.current {height:160px;}

-#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}

-a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}

-#datetime {width:180px;}