diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2016-07-07 11:29:46 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2016-07-07 11:29:46 +0200 |
| commit | ba16fd0d337fa26114f55086198979d147a298c1 (patch) | |
| tree | 39111cec77d17d5eeb60bd1b609e7a8419310459 /core/templates | |
| parent | 5ace43f43895cba4b398367e10731f92450d7da2 (diff) | |
| parent | ed28885d73181e61c06802639910014e8a265e42 (diff) | |
| download | nextcloud-server-ba16fd0d337fa26114f55086198979d147a298c1.tar.gz nextcloud-server-ba16fd0d337fa26114f55086198979d147a298c1.zip | |
Merge branch 'master' into sync-master
Diffstat (limited to 'core/templates')
| -rw-r--r-- | core/templates/installation.php | 1 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | core/templates/singleuser.user.php | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index 98d95541827..f7556988634 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -52,7 +52,6 @@ script('core', [ <label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label> <input type="checkbox" id="show" name="show"> <label for="show"></label> - <div class="strengthify-wrapper"></div> </p> </fieldset> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 370a6e2bd60..4a6937c6ea0 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -19,7 +19,7 @@ <meta name="theme-color" content="<?php p($theme->getMailHeaderColor()); ?>"> <link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>"> <link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>"> - <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="#1d2d44"> + <link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="#0082c9"> <?php foreach($_['cssfiles'] as $cssfile): ?> <link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>"> <?php endforeach; ?> diff --git a/core/templates/singleuser.user.php b/core/templates/singleuser.user.php index bf076eb8d61..ba01c9385f2 100644 --- a/core/templates/singleuser.user.php +++ b/core/templates/singleuser.user.php @@ -1,6 +1,6 @@ <ul> <li class='update'> - <?php p($l->t('This ownCloud instance is currently in single user mode.')) ?><br><br> + <?php p($l->t('This Nextcloud instance is currently in single user mode.')) ?><br><br> <?php p($l->t('This means only administrators can use the instance.')) ?><br><br> <?php p($l->t('Contact your system administrator if this message persists or appeared unexpectedly.')) ?> <br><br> |