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

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

1 files changed, 0 insertions, 14 deletions

diff --git a/program/js/tiny_mce/plugins/style/css/props.css b/program/js/tiny_mce/plugins/style/css/props.css
deleted file mode 100644
index 3b8f0ee77..000000000
--- a/program/js/tiny_mce/plugins/style/css/props.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#text_font {width:250px;}

-#text_size {width:70px;}

-.mceAddSelectValue {background:#DDD;}

-select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}

-#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}

-#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}

-#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}

-.panel_toggle_insert_span {padding-top:10px;}

-.panel_wrapper div.current {padding-top:10px;height:230px;}

-.delim {border-left:1px solid gray;}

-.tdelim {border-bottom:1px solid gray;}

-#block_display {width:145px;}

-#list_type {width:115px;}

-.disabled {background:#EEE;}