Skip to content

Commit bf0cd74

Browse files
CarlSchwanCarlSchwan
committed
More cleanup
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
1 parent 66a7110 commit bf0cd74

File tree

11 files changed

+50
-44
lines changed

11 files changed

+50
-44
lines changed

‎core/css/guest.css‎

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
2+
* SPDX-FileCopyrightText: 2022 Carl Schwan <carl@carlschwan.eu>
23
This file is licensed under the Affero General Public License version 3 or later.
34
See the COPYING-README file. */
45

@@ -235,7 +236,7 @@ select {
235236
padding: 12px;
236237
background-color: var(--color-main-background);
237238
font-weight: bold;
238-
color: var(--color-text-lighter);
239+
color: var(--color-text);
239240
border: none;
240241
border-radius: 100px; /* --border-radius-pill */
241242
cursor: pointer;
@@ -620,10 +621,6 @@ form #selectDbType label span {
620621
.body-login-container {
621622
display: flex;
622623
flex-direction: column;
623-
margin-top: 15px;
624-
padding: 15px;
625-
background-color: rgba(0,0,0,.3);
626-
color: #fff;
627624
text-align: left;
628625
word-wrap: break-word;
629626
border-radius: 10px; /* --border-radius-large */
@@ -634,14 +631,6 @@ form #selectDbType label span {
634631
user-select: text;
635632
}
636633

637-
.body-login-container h2,
638-
.warning h2,
639-
.update h2,
640-
.error h2 {
641-
color: #fff;
642-
text-align: center;
643-
}
644-
645634
/* TODO: Change all .warning/.update/.error to .body-login-container */
646635
.body-login-container .icon-big {
647636
background-size: 70px;
@@ -898,7 +887,18 @@ a.legal {
898887
text-align: left;
899888
}
900889

901-
.error-box, .login-box, .install-form {
890+
.notecard:last-child {
891+
margin-bottom: 0;
892+
}
893+
894+
.notecard pre {
895+
background-color: var(--color-background-dark);
896+
margin-top: 1rem;
897+
padding: 1em 1.3em;
898+
border-radius: var(--border-radius);
899+
}
900+
901+
.guest-box, .error-box, .login-box, .install-form, .body-login-container {
902902
color: var(--color-main-text);
903903
background-color: var(--color-main-background);
904904
padding: 16px;
@@ -907,7 +907,7 @@ a.legal {
907907
display: inline-block;
908908
}
909909

910-
.align-left {
910+
.text-left {
911911
text-align: left;
912912
}
913913

@@ -929,3 +929,7 @@ button.toggle-password {
929929
border-width: 0;
930930
height: 44px;
931931
}
932+
933+
.margin-top {
934+
margin-top: 1rem;
935+
}

‎core/src/components/setup/RecommendedApps.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
<div class="install-form">
2424
<h2>{{ t('core', 'Recommended apps') }}</h2>
2525
<p v-if="loadingApps" class="loading text-center">
26-
{{ t('core', 'Loading apps…') }}
26+
{{ t('core', 'Loading apps …') }}
2727
</p>
2828
<p v-else-if="loadingAppsError" class="loading-error text-center">
2929
{{ t('core', 'Could not fetch list of apps from the App Store.') }}
3030
</p>
3131
<p v-else-if="installingApps" class="text-center">
32-
{{ t('core', 'Installing apps…') }}
32+
{{ t('core', 'Installing apps …') }}
3333
</p>
3434

3535
<div v-for="app in recommendedApps" :key="app.id" class="app">

‎core/src/install.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ window.addEventListener('DOMContentLoaded', function() {
102102
$('#selectDbType').buttonset('disable')
103103
}
104104
$('.strengthify-wrapper, .tipsy')
105-
.css('-ms-filter', '"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"')
106105
.css('filter', 'alpha(opacity=30)')
107106
.css('opacity', 0.3)
108107

‎core/src/views/Login.vue‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,23 @@
9898
<transition name="fade" mode="out-in">
9999
<div class="warning">
100100
{{ t('core', 'Login form is disabled.') }}<br>
101-
<small>{{ t('core', 'Please contact your administrator.') }}
101+
<small>
102+
{{ t('core', 'Please contact your administrator.') }}
102103
</small>
103104
</div>
104105
</transition>
105106
</div>
106107

107-
<div class="alternative-logins" v-for="(alternativeLogin, index) in alternativeLogins" :key="index">
108-
<Button type="primary" @click="goTo(alternativeLogin.href)" class="button-inverted">
108+
<div id="alternative-logins" class="alternative-logins">
109+
<Button v-for="(alternativeLogin, index) in alternativeLogins"
110+
:key="index"
111+
type="primary"
112+
:wide="true"
113+
@click="goTo(alternativeLogin.href)"
114+
class="button-inverted"
115+
:class="[alternativeLogin.class]"
116+
role="link"
117+
:href="alternativeLogin.href">
109118
{{ alternativeLogin.name }}
110119
<template #icon>
111120
<ArrowRight />
@@ -206,12 +215,8 @@ export default {
206215
}
207216
}
208217
209-
.alternative-logins {
210-
display: flex;
211-
justify-content: center;
212-
button {
213-
margin-top: 4px;
214-
margin-bottom: 4px;
215-
}
218+
.alternative-logins button {
219+
margin-top: 12px;
220+
margin-bottom: 4px;
216221
}
217222
</style>

‎core/templates/installation.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<div class="icon-loading-dark float-spinner">&nbsp;</div>
165165

166-
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Install')); ?>" data-finishing="<?php p($l->t('Installing…')); ?>"></div>
166+
<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Install')); ?>" data-finishing="<?php p($l->t('Installing …')); ?>"></div>
167167

168168
<p class="info">
169169
<span class="icon-info-white"></span>

‎core/templates/installation_forbidden.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="error-box">
22
<h2><?php p($l->t('Error')) ?></h2>
3-
<p class="align-left">
3+
<p class="text-left">
44
<?php p($l->t('It looks like you are trying to reinstall your Nextcloud. However the file CAN_INSTALL is missing from your config directory. Please create the file CAN_INSTALL in your config folder to continue.')) ?>
55
</p>
66
</div>

‎core/templates/installation_incomplete.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="error-box">
22
<h2><?php p($l->t('Error')) ?></h2>
3-
<p class="align-left">
3+
<p class="text-left">
44
<?php p($l->t('Could not remove CAN_INSTALL from the config folder. Please remove this file manually.')) ?>
55
</p>
66
</div>

‎core/templates/loginflowv2/authpicker.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
<br/>
4747

4848
<p id="redirect-link">
49-
<a href="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.grantPage', ['stateToken' => $_['stateToken'], 'user' => $_['user']])) ?>" tabindex="-1">
49+
<form action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.grantPage', ['stateToken' => $_['stateToken'], 'user' => $_['user']])) ?>" method="get">
5050
<input type="submit" class="login primary icon-confirm-white" value="<?php p($l->t('Log in')) ?>">
51-
</a>
51+
</form>
5252
</p>
5353

5454
<form action="<?php p($urlGenerator->linkToRouteAbsolute('core.ClientFlowLoginV2.apptokenRedirect')); ?>" method="post" id="app-token-login-field" class="hidden">

‎core/templates/update.admin.php‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
1+
<div class="guest-box update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
22
<div class="updateOverview">
33
<?php if ($_['isAppsOnlyUpgrade']) { ?>
44
<h2 class="title"><?php p($l->t('App update required')); ?></h2>
@@ -7,7 +7,7 @@
77
[$_['productName'], $_['version']])); ?></h2>
88
<?php } ?>
99
<?php if (!empty($_['appsToUpgrade'])) { ?>
10-
<div class="infogroup">
10+
<div class="text-left">
1111
<span><?php p($l->t('The following apps will be updated:')); ?></span>
1212
<ul class="content appList">
1313
<?php foreach ($_['appsToUpgrade'] as $appInfo) { ?>
@@ -17,7 +17,7 @@
1717
</div>
1818
<?php } ?>
1919
<?php if (!empty($_['incompatibleAppsList'])) { ?>
20-
<div class="infogroup">
20+
<div class="text-left">
2121
<span><?php p($l->t('These incompatible apps will be disabled:')) ?></span>
2222
<ul class="content appList">
2323
<?php foreach ($_['incompatibleAppsList'] as $appInfo) { ?>
@@ -31,15 +31,13 @@
3131
<?php p($l->t('The theme %s has been disabled.', [$_['oldTheme']])) ?>
3232
</div>
3333
<?php } ?>
34-
<div class="infogroup bold">
34+
<div class="text-left margin-top bold">
3535
<?php p($l->t('Please make sure that the database, the config folder and the data folder have been backed up before proceeding.')) ?>
3636
</div>
37-
<input class="updateButton primary" type="button" value="<?php p($l->t('Start update')) ?>">
38-
<div class="infogroup">
39-
<em>
37+
<input class="updateButton primary margin-top" type="button" value="<?php p($l->t('Start update')) ?>">
38+
<div class="notecard warning">
4039
<?php p($l->t('To avoid timeouts with larger installations, you can instead run the following command from your installation directory:')) ?>
4140
<pre>./occ upgrade</pre>
42-
</em>
4341
</div>
4442
</div>
4543

‎core/templates/update.use-cli.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="update" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
1+
<div class="guest-box" data-productname="<?php p($_['productName']) ?>" data-version="<?php p($_['version']) ?>">
22
<div class="updateOverview">
33
<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
44
<div class="infogroup">

0 commit comments

Comments
 (0)