diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2020-01-15 07:24:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 07:24:57 +0100 |
| commit | 060dd35ef9658907eb578043437fa476efc7bcaf (patch) | |
| tree | 1384d20b0e5c26b2784976574377338b8b0c998e /core | |
| parent | 9daf35b704f7d7cef2b65d5faf07ea8ec7ef1ea1 (diff) | |
| parent | d873236d36294ed255e0b0184abd998f3887f4ea (diff) | |
| download | nextcloud-server-060dd35ef9658907eb578043437fa476efc7bcaf.tar.gz nextcloud-server-060dd35ef9658907eb578043437fa476efc7bcaf.zip | |
Merge pull request #18873 from nextcloud/design/install-page
Install page design fixes
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/guest.css | 5 | ||||
| -rw-r--r-- | core/js/setup.js | 14 | ||||
| -rw-r--r-- | core/templates/installation.php | 1 |
3 files changed, 6 insertions, 14 deletions
diff --git a/core/css/guest.css b/core/css/guest.css index 7fbab45b929..acdc232f52a 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -649,6 +649,11 @@ form #selectDbType label span { box-shadow: none !important; } +#install-recommended-apps + label span { + display: inline-block; + opacity: .7; +} + /* Errors */ /* Warnings and errors are the same */ .body-login-container, diff --git a/core/js/setup.js b/core/js/setup.js index eb41795e427..7cf4c38071e 100644 --- a/core/js/setup.js +++ b/core/js/setup.js @@ -123,18 +123,4 @@ $(document).ready(function() { drawTitles: true, 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); - } }); diff --git a/core/templates/installation.php b/core/templates/installation.php index eb224364844..4efcebec38c 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -163,6 +163,7 @@ script('core', [ <input type="checkbox" id="install-recommended-apps" name="install-recommended-apps" class="checkbox checkbox--white" checked> <label for="install-recommended-apps"> <?php p($l->t( 'Install recommended apps' )); ?> + <span><?php p($l->t( 'Calendar, Contacts, Talk & Mail' )); ?></span> </label> </p> </fieldset> |