Skip to content

Commit 66a7110

Browse files
committed
Adapt install page to new design
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
1 parent f256773 commit 66a7110

22 files changed

+162
-167
lines changed

core/css/guest.css

Lines changed: 63 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,6 @@ body {
4545
text-decoration-skip-ink: auto;
4646
}
4747

48-
#showAdvanced {
49-
color: var(--color-primary-text);
50-
}
51-
5248
em {
5349
font-style: normal;
5450
opacity: .5;
@@ -111,19 +107,22 @@ form {
111107
}
112108
form fieldset {
113109
width: 260px;
114-
margin: auto auto 20px;
110+
margin-top: 8px;
115111
-webkit-user-select: none;
116112
-moz-user-select: none;
117113
-ms-user-select: none;
118114
user-select: none;
119115
}
120116
form #sqliteInformation {
121-
margin-top: -20px;
117+
margin-top: 0px;
122118
margin-bottom: 20px;
123119
}
124120
form #adminaccount {
125121
margin-bottom: 15px;
126122
}
123+
form #advancedHeader {
124+
width: 100%;
125+
}
127126
form fieldset legend, #datadirContent label {
128127
width: 100%;
129128
}
@@ -208,11 +207,21 @@ input:not([type='password']),
208207
a.button {
209208
font-size: 20px;
210209
margin: 5px;
211-
padding: 11px 10px 9px;
210+
padding: 5px;
212211
outline: none;
213212
border-radius: 3px; /* --border-radius */
214213
-webkit-appearance: none;
215214
}
215+
216+
input:not([type='radio']),
217+
input:not([type='range']) {
218+
border-width: 2px;
219+
}
220+
221+
input:not([type='range']):focus-visible {
222+
box-shadow: none !important;
223+
}
224+
216225
input[type='submit'],
217226
input[type='submit'].icon-confirm,
218227
input[type='button'],
@@ -232,30 +241,30 @@ select {
232241
cursor: pointer;
233242
}
234243
input[type='submit']:focus {
235-
border: 2px solid black !important;
236-
padding: 8px;
244+
box-shadow: 0 0 0 2px inset var(--color-main-text) !important;
237245
}
238246
input[type='text'],
239247
input[type='tel'],
240248
input[type='password'],
241249
input[type='email'] {
242-
width: 249px;
243-
background: #fff;
250+
width: 266px;
251+
padding: 5px 10px;
244252
color: var(--color-text-lighter);
245253
cursor: text;
246254
font-family: inherit;
247255
-webkit-appearance: textfield;
248256
-moz-appearance: textfield;
249257
box-sizing: content-box;
250-
border: none;
251258
font-weight: normal;
259+
margin-left: 0;
260+
margin-right: 0;
252261
}
253262
input[type='text']:focus-visible,
254263
input[type='password']:focus-visible {
255264
outline: var(--color-primary) auto 2px;
256265
}
257266
input[type='password'].password-with-toggle, input[type='text'].password-with-toggle {
258-
width: 219px;
267+
width: 236px;
259268
padding-right: 40px;
260269
}
261270
input.login {
@@ -296,8 +305,6 @@ button.primary:not(:disabled):focus,
296305
a.primary:not(:disabled):hover,
297306
a.primary:not(:disabled):focus {
298307
color: var(--color-primary-text);
299-
background-image: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-light) 130%);
300-
background-position: initial;
301308
}
302309

303310
/* Checkboxes - white only for login */
@@ -358,24 +365,27 @@ input[type='checkbox'].checkbox--white:checked + label:before {
358365
display: inline-block;
359366
position: relative;
360367
top: -20px;
361-
width: 269px;
368+
width: 286px;
362369
border-radius: 0 0 3px 3px;
363370
overflow: hidden;
364371
height: 3px;
365372
}
366373
.tooltip-inner {
367374
font-weight: bold;
368-
color: #ccc;
369375
padding: 3px 6px;
370376
text-align: center;
371377
}
372378

373379
/* Show password toggle */
374380
#show, #dbpassword-toggle {
375381
position: absolute;
376-
right: 1em;
377-
top: .8em;
378-
float: right;
382+
right: 2px;
383+
top: 4px;
384+
display: flex;
385+
justify-content: center;
386+
width: 44px;
387+
align-content: center;
388+
padding: 13px;
379389
}
380390
#show + label, #dbpassword-toggle + label {
381391
right: 21px;
@@ -507,12 +517,9 @@ form .warning input[type='checkbox']+label {
507517
#reset-password-wrapper + a {
508518
display: inline-block;
509519
font-weight: normal !important;
510-
padding: 12px;
520+
padding: 12px 12px 0 12px;
511521
cursor: pointer;
512522
}
513-
#lost-password {
514-
margin-top: -6px;
515-
}
516523
#forgot-password {
517524
padding: 11px;
518525
float: right;
@@ -568,20 +575,17 @@ form #selectDbType label {
568575
flex-grow: 1;
569576
margin: 0 -1px 5px;
570577
font-size: 12px;
571-
background:#f8f8f8;
572-
color:#888;
578+
background: var(--color-background-hover);
579+
color: var(--color-main-text);
573580
cursor:pointer;
574-
border: 1px solid #ddd;
581+
border: 1px solid var(--color-border);
575582
padding: 10px 17px;
576583
}
577584
form #selectDbType label.ui-state-hover,
578585
form #selectDbType label.ui-state-active {
579586
font-weight: normal;
580-
color:#000;
581-
background-color:#e8e8e8;
582-
}
583-
form #selectDbType .ui-visual-focus {
584-
box-shadow: none;
587+
background: var(--color-background-darker);
588+
color: var(--color-main-text);
585589
}
586590
form #selectDbType label span {
587591
display: none;
@@ -597,11 +601,11 @@ form #selectDbType label span {
597601
-ms-user-select: none;
598602
user-select: none;
599603
}
600-
.grouptop input {
601-
margin-bottom: 3px !important;
604+
.grouptop, .groupmiddle {
605+
margin-bottom: 8px !important;
602606
}
603-
.groupbottom input {
604-
margin-top: 3px !important;
607+
.groupbottom {
608+
margin-bottom: 13px;
605609
}
606610
.groupbottom input[type=submit] {
607611
box-shadow: none !important;
@@ -658,7 +662,6 @@ form #selectDbType label span {
658662
.warning legend,
659663
.warning a,
660664
.error a {
661-
color: #fff !important;
662665
font-weight: bold !important;
663666
opacity: 1;
664667
}
@@ -684,15 +687,6 @@ form #selectDbType label span {
684687
a.warning {
685688
cursor: pointer;
686689
}
687-
fieldset.warning legend,
688-
fieldset.update legend {
689-
top: 18px;
690-
position: relative;
691-
}
692-
fieldset.warning legend + p,
693-
fieldset.update legend + p {
694-
margin-top: 12px;
695-
}
696690

697691
/* Various paragraph styles */
698692
.infogroup {
@@ -904,15 +898,34 @@ a.legal {
904898
text-align: left;
905899
}
906900

907-
.error-box, .login-box {
901+
.error-box, .login-box, .install-form {
908902
color: var(--color-main-text);
909903
background-color: var(--color-main-background);
910904
padding: 16px;
911905
border-radius: var(--border-radius-large);
912906
box-shadow: 0 0 10px var(--color-box-shadow);
913907
display: inline-block;
908+
}
914909

915-
&.wide {
916-
display: block;
917-
}
910+
.align-left {
911+
text-align: left;
912+
}
913+
914+
.error-box.wide, .login-box.wide {
915+
display: block;
916+
text-align: left;
917+
}
918+
919+
.login-box fieldset {
920+
margin-top: 0;
921+
}
922+
923+
.error-box pre {
924+
overflow-x: scroll;
925+
}
926+
927+
button.toggle-password {
928+
background-color: transparent;
929+
border-width: 0;
930+
height: 44px;
918931
}

core/css/inputs.css

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/inputs.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/inputs.scss

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,8 @@ div[contenteditable=true],
8585
&:required {
8686
box-shadow: none;
8787
}
88-
&:invalid {
89-
box-shadow: none !important;
90-
border-color: var(--color-error);
88+
&:user-invalid {
89+
box-shadow: 0 0 0 2px var(--color-error) !important;
9190
}
9291
/* Primary action button, use sparingly */
9392
&.primary {

core/css/login/authpicker.css

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
.picker-window {
2-
display: block;
2+
display: inline-block;
33
padding: 16px;
4-
margin: 20px 0;
4+
margin: 20px;
55
background-color: var(--color-main-background);
66
color: var(--color-main-text);
77
border-radius: var(--border-radius-large);
8-
box-shadow: 0 0 10px var(--color-box-shadow);
8+
box-shadow: 0 0 10px var(--color-box-shadow);
99
cursor: default;
1010
}
1111

12+
.picker-window.small {
13+
max-width: 400px;
14+
}
15+
1216
.picker-window h2 {
1317
margin: 20px auto;
1418
}

core/css/server.css

Lines changed: 10 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/server.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/css/styles.css

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)