mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4044 from nextcloud/merge-login-js 

Merge login JS
This commit is contained in:
Morris Jobke 2017-03-24 15:38:29 -06:00 committed by GitHub
parent 4f73911bab 6a4fde11e6
commit 8aedebff22
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/js/merged-login.json Normal file
View File

@ -0,0 +1,5 @@
[
"visitortimezone.js",
"lostpassword.js",
"login.js"
]

6
core/templates/login.php
View File

@ -1,11 +1,7 @@
<?php /** @var $l \OCP\IL10N */ ?> <?php /** @var $l \OCP\IL10N */ ?>
<?php <?php
vendor_script('jsTimezoneDetect/jstz'); vendor_script('jsTimezoneDetect/jstz');
script('core', [ script('core', 'merged-login');
'visitortimezone',
'lostpassword',
'login'
]);
?> ?>
<!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]--> <!--[if IE 8]><style>input[type="checkbox"]{padding:0;}</style><![endif]-->