wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18901 from nextcloud/backport/18873/stable18

Browse source 
[stable18] Install page design fixes
This commit is contained in:
Roeland Jago Douma 2020-01-15 18:12:02 +01:00 committed by GitHub
commit bcb8ce3e07
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/css/guest.css
View file

@ -645,6 +645,11 @@ form #selectDbType label span {
box-shadow: none !important; box-shadow: none !important;
} }
#install-recommended-apps + label span {
display: inline-block;
opacity: .7;
}
/* Errors */ /* Errors */
/* Warnings and errors are the same */ /* Warnings and errors are the same */
.body-login-container, .body-login-container,

14
core/js/setup.js
View file

@ -123,18 +123,4 @@ $(document).ready(function() {
drawTitles: true, drawTitles: true,
nonce: btoa(OC.requestToken), nonce: btoa(OC.requestToken),
}); });
// centers the database chooser if it is too wide
if($('#databaseBackend').width() > 300) {
// this somehow needs to wait 250 milliseconds
// otherwise it gets overwritten
setTimeout(function(){
// calculate negative left margin
// half of the difference of width and default bix width of 300
// add 10 to clear left side padding of button group
var leftMargin = (($('#databaseBackend').width() - 300) / 2 + 10 ) * -1;
$('#databaseBackend').css('margin-left', Math.floor(leftMargin) + 'px');
}, 250);
}
}); });

1
core/templates/installation.php
View file

@ -163,6 +163,7 @@ script('core', [
<input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked> <input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked>
<label for="install-recommended-apps"> <label for="install-recommended-apps">
<?php p($l->t( 'Install recommended apps' )); ?> <?php p($l->t( 'Install recommended apps' )); ?>
<span><?php p($l->t( 'Calendar, Contacts, Talk & Mail' )); ?></span>
</label> </label>
</p> </p>
</fieldset> </fieldset>