Merge remote-tracking branch 'origin/master'HEADmaster

Conflicts:
	composer.json-dist
	config/defaults.inc.php
	plugins
	plugins/acl/acl.js
	plugins/acl/acl.php
	plugins/acl/skins/classic/templates/table.html
	plugins/acl/skins/larry/templates/table.html
	plugins/enigma/README
	plugins/enigma/config.inc.php.dist
	plugins/enigma/enigma.js
	plugins/enigma/enigma.php
	plugins/enigma/lib/enigma_driver.php
	plugins/enigma/lib/enigma_driver_gnupg.php
	plugins/enigma/lib/enigma_driver_phpssl.php
	plugins/enigma/lib/enigma_engine.php
	plugins/enigma/lib/enigma_error.php
	plugins/enigma/lib/enigma_key.php
	plugins/enigma/lib/enigma_signature.php
	plugins/enigma/lib/enigma_subkey.php
	plugins/enigma/lib/enigma_ui.php
	plugins/enigma/lib/enigma_userid.php
	plugins/enigma/localization/en_US.inc
	plugins/enigma/localization/ja_JP.inc
	plugins/enigma/localization/ru_RU.inc
	plugins/enigma/skins/classic/enigma.css
	plugins/enigma/skins/classic/templates/keys.html
	plugins/help/config.inc.php.dist
	plugins/help/help.php
	plugins/help/localization/en_US.inc
	plugins/jqueryui/jqueryui.php
	plugins/managesieve/Changelog
	plugins/managesieve/composer.json
	plugins/managesieve/config.inc.php.dist
	plugins/managesieve/lib/Roundcube/rcube_sieve.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php
	plugins/managesieve/lib/Roundcube/rcube_sieve_vacation.php
	plugins/managesieve/localization/en_US.inc
	plugins/managesieve/managesieve.js
	plugins/managesieve/skins/classic/managesieve.css
	plugins/managesieve/skins/larry/managesieve.css
	plugins/password/README
	plugins/password/config.inc.php.dist
	plugins/password/drivers/ldap.php
	plugins/password/drivers/poppassd.php
	plugins/password/drivers/vpopmaild.php
	plugins/vcard_attachments/vcardattach.js
	plugins/zipdownload/zipdownload.php

1 files changed, 39 insertions, 0 deletions

diff --git a/plugins/new_user_dialog/newuserdialog.css b/plugins/new_user_dialog/newuserdialog.css
new file mode 100644
index 000000000..207604dd1
--- /dev/null
+++ b/plugins/new_user_dialog/newuserdialog.css
@@ -0,0 +1,39 @@
+/** Styles for the new-user-dialog box */
+
+#newuserdialog {
+	display: none;
+}
+
+#newuserdialog h3 {
+	color: #333;
+	font-size: normal;
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+#newuserdialog p.hint {
+	margin-top: 0.5em;
+	margin-bottom: 1em;
+	font-style: italic;
+}
+
+#newuserdialog table td.title {
+	color: #666;
+	text-align: right;
+	padding-right: 1em;
+	white-space: nowrap;
+}
+
+#newuserdialog table td input,
+#newuserdialog table td textarea {
+	width: 20em;
+}
+
+#newuserdialog .formbuttons {
+	margin-top: 1.5em;
+	text-align: center;
+}
+
+.ui-dialog-titlebar-close {
+	display: none;
+}
\ No newline at end of file