Skip to content

Commit a8b30c1

Browse files
nathan-continonathan-contino
authored
Merge pull request #5 from FusionAuth/kickstart-fix
FIxes issue with kickstart templates
2 parents cfa7277 + f404f40 commit a8b30c1

55 files changed

Lines changed: 5326 additions & 56 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎kickstart/css/styles.css‎

Lines changed: 49 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:root {
22
--main-text-color: #424242;
3-
--main-accent-color: #083b94;
3+
--main-accent-color: #096324;
44
--input-background: #fbfbfb;
55
--body-background: #f7f7f7;
66
--tooltip-background: #e2e2e2;
@@ -33,7 +33,7 @@ body {
3333
/* Changes for Powered by FusionAuth div */
3434
body > main main.page-body {
3535
min-height: calc(100vh - 3rem); /* to make the Powered by FusionAuth div position at the bottom of the page if the page is shorter than the viewport */
36-
padding-top: 5rem;
36+
padding-top: 3rem;
3737
}
3838
body > main {
3939
padding-bottom: 2.5rem; /* giving Powered by FusionAuth more space */
@@ -44,15 +44,10 @@ body > main {
4444
/* End Powered by FusionAuth */
4545

4646

47-
/* Uncomment following to hide help bar at top */
48-
/*
47+
/* Hiding help bar at top */
4948
body > main {
5049
padding-top: 0;
5150
}
52-
body > main header.app-header {
53-
display: none;
54-
}
55-
*/
5651
/* end help bar */
5752

5853

@@ -100,7 +95,7 @@ a:visited {
10095
.button.blue:hover {
10196
opacity: .8 !important;
10297
background: var(--main-accent-color) !important;
103-
}
98+
}
10499
.button.blue:focus {
105100
background: var(--main-accent-color) !important;
106101
box-shadow: inset 0 1px 2px rgba(0,0,0,0.4),0 0 0 2px rgba(57,152,219,0.4);
@@ -163,9 +158,9 @@ label.checkbox {
163158
margin: 1rem 0;
164159
font-weight: 400;
165160
}
166-
.input-addon-group,
167-
.input-addon-group > :last-child:not(.flat),
168-
.input-addon-group > .input:last-child:not(.flat),
161+
.input-addon-group,
162+
.input-addon-group > :last-child:not(.flat),
163+
.input-addon-group > .input:last-child:not(.flat),
169164
.input-addon-group > input:last-child:not(.flat) {
170165
color: var(--main-text-color); /* overriding typical text color for inputs */
171166
}
@@ -175,18 +170,18 @@ label.checkbox {
175170
input::placeholder {
176171
color: var(--main-text-color);
177172
}
178-
.input,
179-
input[type="email"],
180-
input[type="file"],
181-
input[type="number"],
182-
input[type="search"],
183-
input[type="text"],
184-
input[type="tel"],
185-
input[type="url"],
186-
input[type="password"],
187-
textarea,
173+
.input,
174+
input[type="email"],
175+
input[type="file"],
176+
input[type="number"],
177+
input[type="search"],
178+
input[type="text"],
179+
input[type="tel"],
180+
input[type="url"],
181+
input[type="password"],
182+
textarea,
188183
label.select select
189-
{
184+
{
190185
background: var(--input-background);
191186
border: 1px solid var(--border-color) !important;
192187
border-radius: .25rem !important;
@@ -310,7 +305,7 @@ input[type="checkbox"]:checked:after {
310305
left: .25rem;
311306
top: .3125rem;
312307
transform: rotate(-46deg);
313-
width: .625 rem;
308+
width: .625rem;
314309
display: block;
315310
position: absolute;
316311
}
@@ -406,7 +401,7 @@ table thead tr {
406401
background: var(--main-accent-color);
407402
height: 1rem;
408403
}
409-
hr,
404+
hr,
410405
.hr-container hr {
411406
border: none;
412407
height: 1px;
@@ -488,7 +483,7 @@ hr,
488483
#oauth-complete-reg .page-body > .row > .col-sm-8,
489484
#oauth-complete-reg .page-body > .row > .col-md-6,
490485
#oauth-complete-reg .page-body > .row > .col-lg-5,
491-
#oauth-complete-reg .page-body > .row > .col-xl-4,
486+
#oauth-complete-reg .page-body > .row > .col-xl-4,
492487
#oauth-child-reg .page-body > .row > .col-xs,
493488
#oauth-child-reg .page-body > .row > .col-sm-8,
494489
#oauth-child-reg .page-body > .row > .col-md-6,
@@ -498,47 +493,47 @@ hr,
498493
#oauth-child-reg-complete .page-body > .row > .col-sm-8,
499494
#oauth-child-reg-complete .page-body > .row > .col-md-6,
500495
#oauth-child-reg-complete .page-body > .row > .col-lg-5,
501-
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
496+
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
502497
#oauth-not-registered .page-body > .row > .col-xs,
503498
#oauth-not-registered .page-body > .row > .col-sm-8,
504499
#oauth-not-registered .page-body > .row > .col-md-6,
505500
#oauth-not-registered .page-body > .row > .col-lg-5,
506-
#oauth-not-registered .page-body > .row > .col-xl-4,
501+
#oauth-not-registered .page-body > .row > .col-xl-4,
507502
#oauth-error .page-body > .row > .col-xs,
508503
#oauth-error .page-body > .row > .col-sm-8,
509504
#oauth-error .page-body > .row > .col-md-6,
510505
#oauth-error .page-body > .row > .col-lg-5,
511-
#oauth-error .page-body > .row > .col-xl-4,
506+
#oauth-error .page-body > .row > .col-xl-4,
512507
#oauthstart-idp-link .page-body > .row > .col-xs,
513508
#oauthstart-idp-link .page-body > .row > .col-sm-8,
514509
#oauthstart-idp-link .page-body > .row > .col-md-6,
515510
#oauthstart-idp-link .page-body > .row > .col-lg-5,
516-
#oauthstart-idp-link .page-body > .row > .col-xl-4,
511+
#oauthstart-idp-link .page-body > .row > .col-xl-4,
517512
#oauth-wait .page-body > .row > .col-xs,
518513
#oauth-wait .page-body > .row > .col-sm-8,
519514
#oauth-wait .page-body > .row > .col-md-6,
520515
#oauth-wait .page-body > .row > .col-lg-5,
521-
#oauth-wait .page-body > .row > .col-xl-4,
516+
#oauth-wait .page-body > .row > .col-xl-4,
522517
#email-verification .page-body > .row > .col-xs,
523518
#email-verification .page-body > .row > .col-sm-8,
524519
#email-verification .page-body > .row > .col-md-6,
525520
#email-verification .page-body > .row > .col-lg-5,
526-
#email-verification .page-body > .row > .col-xl-4,
521+
#email-verification .page-body > .row > .col-xl-4,
527522
#email-ver-required .page-body > .row > .col-xs,
528523
#email-ver-required .page-body > .row > .col-sm-8,
529524
#email-ver-required .page-body > .row > .col-md-6,
530525
#email-ver-required .page-body > .row > .col-lg-5,
531-
#email-ver-required .page-body > .row > .col-xl-4,
526+
#email-ver-required .page-body > .row > .col-xl-4,
532527
#email-ver-complete .page-body > .row > .col-xs,
533528
#email-ver-complete .page-body > .row > .col-sm-8,
534529
#email-ver-complete .page-body > .row > .col-md-6,
535530
#email-ver-complete .page-body > .row > .col-lg-5,
536-
#email-ver-complete .page-body > .row > .col-xl-4,
531+
#email-ver-complete .page-body > .row > .col-xl-4,
537532
#email-ver-resent .page-body > .row > .col-xs,
538533
#email-ver-resent .page-body > .row > .col-sm-8,
539534
#email-ver-resent .page-body > .row > .col-md-6,
540535
#email-ver-resent .page-body > .row > .col-lg-5,
541-
#email-ver-resent .page-body > .row > .col-xl-4,
536+
#email-ver-resent .page-body > .row > .col-xl-4,
542537
#forgot-pwd .page-body > .row > .col-xs,
543538
#forgot-pwd .page-body > .row > .col-sm-8,
544539
#forgot-pwd .page-body > .row > .col-md-6,
@@ -572,7 +567,7 @@ hr,
572567
#acct-2fa-enable .page-body > .row > .col-xs-12,
573568
#acct-2fa-enable .page-body > .row > .col-sm-12,
574569
#acct-2fa-enable .page-body > .row > .col-md-10,
575-
#acct-2fa-enable .page-body > .row > .col-lg-8,
570+
#acct-2fa-enable .page-body > .row > .col-lg-8,
576571
#acct-2fa-disable .page-body > .row > .col-xs-12,
577572
#acct-2fa-disable .page-body > .row > .col-sm-12,
578573
#acct-2fa-disable .page-body > .row > .col-md-10,
@@ -583,12 +578,12 @@ hr,
583578
#unauthorized-page .page-body > .row > .col-xl-5,
584579
#change-pwd .page-body > .row > .col-xs,
585580
#change-pwd .page-body > .row > .col-sm-8,
586-
#change-pwd .page-body > .row > .col-md-6,
581+
#change-pwd .page-body > .row > .col-md-6,
587582
#change-pwd .page-body > .row > .col-lg-5,
588583
#change-pwd .page-body > .row > .col-xl-4,
589584
#change-pwd-complete .page-body > .row > .col-xs,
590585
#change-pwd-complete .page-body > .row > .col-sm-8,
591-
#change-pwd-complete .page-body > .row > .col-md-6,
586+
#change-pwd-complete .page-body > .row > .col-md-6,
592587
#change-pwd-complete .page-body > .row > .col-lg-5,
593588
#change-pwd-complete .page-body > .row > .col-xl-4 {
594589
flex-basis: 33rem;
@@ -640,7 +635,7 @@ hr,
640635
#oauth-complete-reg .page-body > .row > .col-sm-8,
641636
#oauth-complete-reg .page-body > .row > .col-md-6,
642637
#oauth-complete-reg .page-body > .row > .col-lg-5,
643-
#oauth-complete-reg .page-body > .row > .col-xl-4,
638+
#oauth-complete-reg .page-body > .row > .col-xl-4,
644639
#oauth-child-reg .page-body > .row > .col-xs,
645640
#oauth-child-reg .page-body > .row > .col-sm-8,
646641
#oauth-child-reg .page-body > .row > .col-md-6,
@@ -650,17 +645,17 @@ hr,
650645
#oauth-child-reg-complete .page-body > .row > .col-sm-8,
651646
#oauth-child-reg-complete .page-body > .row > .col-md-6,
652647
#oauth-child-reg-complete .page-body > .row > .col-lg-5,
653-
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
648+
#oauth-child-reg-complete .page-body > .row > .col-xl-4,
654649
#oauth-not-registered .page-body > .row > .col-xs,
655650
#oauth-not-registered .page-body > .row > .col-sm-8,
656651
#oauth-not-registered .page-body > .row > .col-md-6,
657652
#oauth-not-registered .page-body > .row > .col-lg-5,
658-
#oauth-not-registered .page-body > .row > .col-xl-4,
653+
#oauth-not-registered .page-body > .row > .col-xl-4,
659654
#oauth-error .page-body > .row > .col-xs,
660655
#oauth-error .page-body > .row > .col-sm-8,
661656
#oauth-error .page-body > .row > .col-md-6,
662657
#oauth-error .page-body > .row > .col-lg-5,
663-
#oauth-error .page-body > .row > .col-xl-4,
658+
#oauth-error .page-body > .row > .col-xl-4,
664659
#oauthstart-idp-link .page-body > .row > .col-xs,
665660
#oauthstart-idp-link .page-body > .row > .col-sm-8,
666661
#oauthstart-idp-link .page-body > .row > .col-md-6,
@@ -670,27 +665,27 @@ hr,
670665
#oauth-wait .page-body > .row > .col-sm-8,
671666
#oauth-wait .page-body > .row > .col-md-6,
672667
#oauth-wait .page-body > .row > .col-lg-5,
673-
#oauth-wait .page-body > .row > .col-xl-4,
668+
#oauth-wait .page-body > .row > .col-xl-4,
674669
#email-verification .page-body > .row > .col-xs,
675670
#email-verification .page-body > .row > .col-sm-8,
676671
#email-verification .page-body > .row > .col-md-6,
677672
#email-verification .page-body > .row > .col-lg-5,
678-
#email-verification .page-body > .row > .col-xl-4,
673+
#email-verification .page-body > .row > .col-xl-4,
679674
#email-ver-required .page-body > .row > .col-xs,
680675
#email-ver-required .page-body > .row > .col-sm-8,
681676
#email-ver-required .page-body > .row > .col-md-6,
682677
#email-ver-required .page-body > .row > .col-lg-5,
683-
#email-ver-required .page-body > .row > .col-xl-4,
678+
#email-ver-required .page-body > .row > .col-xl-4,
684679
#email-ver-complete .page-body > .row > .col-xs,
685680
#email-ver-complete .page-body > .row > .col-sm-8,
686681
#email-ver-complete .page-body > .row > .col-md-6,
687682
#email-ver-complete .page-body > .row > .col-lg-5,
688-
#email-ver-complete .page-body > .row > .col-xl-4,
683+
#email-ver-complete .page-body > .row > .col-xl-4,
689684
#email-ver-resent .page-body > .row > .col-xs,
690685
#email-ver-resent .page-body > .row > .col-sm-8,
691686
#email-ver-resent .page-body > .row > .col-md-6,
692687
#email-ver-resent .page-body > .row > .col-lg-5,
693-
#email-ver-resent .page-body > .row > .col-xl-4,
688+
#email-ver-resent .page-body > .row > .col-xl-4,
694689
#forgot-pwd .page-body > .row > .col-xs,
695690
#forgot-pwd .page-body > .row > .col-sm-8,
696691
#forgot-pwd .page-body > .row > .col-md-6,
@@ -735,12 +730,12 @@ hr,
735730
#unauthorized-page .page-body > .row > .col-xl-5,
736731
#change-pwd .page-body > .row > .col-xs,
737732
#change-pwd .page-body > .row > .col-sm-8,
738-
#change-pwd .page-body > .row > .col-md-6,
733+
#change-pwd .page-body > .row > .col-md-6,
739734
#change-pwd .page-body > .row > .col-lg-5,
740735
#change-pwd .page-body > .row > .col-xl-4,
741736
#change-pwd-complete .page-body > .row > .col-xs,
742737
#change-pwd-complete .page-body > .row > .col-sm-8,
743-
#change-pwd-complete .page-body > .row > .col-md-6,
738+
#change-pwd-complete .page-body > .row > .col-md-6,
744739
#change-pwd-complete .page-body > .row > .col-lg-5,
745740
#change-pwd-complete .page-body > .row > .col-xl-4 {
746741
flex-basis: calc(100% - 30px);
@@ -764,7 +759,7 @@ hr,
764759
#acct-2fa-index .page-body > .row > .col-lg-8 {
765760
flex-basis: 54.125rem;
766761
max-width: 54.125rem;
767-
}
762+
}
768763
#acct-2fa-index .page-body > .row.center:last-of-type {
769764
width: 54.125rem;
770765
}
@@ -787,10 +782,10 @@ hr,
787782
#oauth-two-factor-methods .full,
788783
#oauth-two-factor-methods .blue.button,
789784
#oauth-authorize .panel > main > form > .form-row:first-of-type,
790-
#oauth-passwordless .panel > main > .full > .form-row:first-of-type,
785+
#oauth-passwordless .panel > main > .full > .form-row:first-of-type,
791786
#oauth-register .panel > main > .full > .form-row:first-of-type,
792787
#forgot-pwd .panel > main > .full fieldset,
793-
#forgot-pwd .panel .grecaptcha-msg,
788+
#forgot-pwd .panel .grecaptcha-msg,
794789
#change-pwd .panel > main .full > .form-row:first-of-type,
795790
#acct-2fa-index .panel > main > fieldset {
796791
margin-bottom: 0;
@@ -1000,10 +995,10 @@ hr,
1000995
#acct-index .page-body > .row:first-of-type > .col-lg-8 {
1001996
flex-basis: 54.125rem;
1002997
max-width: 54.125rem;
1003-
}
998+
}
1004999
#acct-index .page-body > .row.center:last-of-type {
10051000
width: 54.125rem;
1006-
}
1001+
}
10071002
#acct-index .panel:before {
10081003
width: 6.25rem;
10091004
}

‎kickstart/kickstart.json‎

Lines changed: 57 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,64 @@
9696
"method": "POST",
9797
"url": "/api/theme/#{newThemeId}",
9898
"body": {
99-
"sourceThemeId": "75a068fd-e94b-451a-9aeb-3ddb9a3b5987",
10099
"theme": {
101-
"name": "ChangeBank theme"
100+
"name": "Thymeleaf theme",
101+
"defaultMessages": "@{templates/defaultMessages.txt}",
102+
"stylesheet": "@{css/styles.css}",
103+
"templates": {
104+
"accountEdit": "@{templates/accountEdit.ftl}",
105+
"accountIndex": "@{templates/accountIndex.ftl}",
106+
"accountTwoFactorDisable": "@{templates/accountTwoFactorDisable.ftl}",
107+
"accountTwoFactorEnable": "@{templates/accountTwoFactorEnable.ftl}",
108+
"accountTwoFactorIndex": "@{templates/accountTwoFactorIndex.ftl}",
109+
"accountWebAuthnAdd": "@{templates/accountWebAuthnAdd.ftl}",
110+
"accountWebAuthnDelete": "@{templates/accountWebAuthnDelete.ftl}",
111+
"accountWebAuthnIndex": "@{templates/accountWebAuthnIndex.ftl}",
112+
"confirmationRequired": "@{templates/confirmationRequired.ftl}",
113+
"emailComplete": "@{templates/emailComplete.ftl}",
114+
"emailSend": "@{templates/emailSend.ftl}",
115+
"emailSent": "@{templates/emailSent.ftl}",
116+
"emailVerificationRequired": "@{templates/emailVerificationRequired.ftl}",
117+
"emailVerify": "@{templates/emailVerify.ftl}",
118+
"helpers": "@{templates/helpers.ftl}",
119+
"index": "@{templates/index.ftl}",
120+
"oauth2Authorize": "@{templates/oauth2Authorize.ftl}",
121+
"oauth2AuthorizedNotRegistered": "@{templates/oauth2AuthorizedNotRegistered.ftl}",
122+
"oauth2ChildRegistrationNotAllowed": "@{templates/oauth2ChildRegistrationNotAllowed.ftl}",
123+
"oauth2ChildRegistrationNotAllowedComplete": "@{templates/oauth2ChildRegistrationNotAllowedComplete.ftl}",
124+
"oauth2CompleteRegistration": "@{templates/oauth2CompleteRegistration.ftl}",
125+
"oauth2Consent": "@{templates/oauth2Consent.ftl}",
126+
"oauth2Device": "@{templates/oauth2Device.ftl}",
127+
"oauth2DeviceComplete": "@{templates/oauth2DeviceComplete.ftl}",
128+
"oauth2Error": "@{templates/oauth2Error.ftl}",
129+
"oauth2Logout": "@{templates/oauth2Logout.ftl}",
130+
"oauth2Passwordless": "@{templates/oauth2Passwordless.ftl}",
131+
"oauth2Register": "@{templates/oauth2Register.ftl}",
132+
"oauth2StartIdPLink": "@{templates/oauth2StartIdPLink.ftl}",
133+
"oauth2TwoFactor": "@{templates/oauth2TwoFactor.ftl}",
134+
"oauth2TwoFactorEnable": "@{templates/oauth2TwoFactorEnable.ftl}",
135+
"oauth2TwoFactorEnableComplete": "@{templates/oauth2TwoFactorEnableComplete.ftl}",
136+
"oauth2TwoFactorMethods": "@{templates/oauth2TwoFactorMethods.ftl}",
137+
"oauth2Wait": "@{templates/oauth2Wait.ftl}",
138+
"oauth2WebAuthn": "@{templates/oauth2WebAuthn.ftl}",
139+
"oauth2WebAuthnReauth": "@{templates/oauth2WebAuthnReauth.ftl}",
140+
"oauth2WebAuthnReauthEnable": "@{templates/oauth2WebAuthnReauthEnable.ftl}",
141+
"passwordChange": "@{templates/passwordChange.ftl}",
142+
"passwordComplete": "@{templates/passwordComplete.ftl}",
143+
"passwordForgot": "@{templates/passwordForgot.ftl}",
144+
"passwordSent": "@{templates/passwordSent.ftl}",
145+
"phoneComplete": "Phone complete template",
146+
"phoneSent": "Phone sent template",
147+
"phoneVerificationRequired": "Phone verification required template",
148+
"phoneVerify": "Phone verify template",
149+
"registrationComplete": "@{templates/registrationComplete.ftl}",
150+
"registrationSend": "@{templates/registrationSend.ftl}",
151+
"registrationSent": "@{templates/registrationSent.ftl}",
152+
"registrationVerificationRequired": "@{templates/registrationVerificationRequired.ftl}",
153+
"registrationVerify": "@{templates/registrationVerify.ftl}",
154+
"samlv2Logout": "@{templates/samlv2Logout.ftl}",
155+
"unauthorized" : "@{templates/unauthorized.ftl}"
156+
}
102157
}
103158
}
104159
},

0 commit comments

Comments
 (0)