Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UX Overhaul Part 1 #3047

Merged
merged 147 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
147 commits
Select commit Hold shift + click to select a range
bb09b94
login flow uodates
therobbiedavis Jan 16, 2024
d666484
Merge branch 'develop' into feature/revamped-ux
therobbiedavis Jan 16, 2024
2b4420f
style updates and increase to password max length
therobbiedavis Jan 23, 2024
01ee034
Merge branch 'develop' into feature/revamped-ux
therobbiedavis Jul 8, 2024
dffd215
Updating default theme and login ux
therobbiedavis Jul 8, 2024
8635b0e
Lots of style fixes and uniformity fixes
therobbiedavis Jul 9, 2024
0cf8aa3
PR Review feedback
therobbiedavis Jul 9, 2024
acde886
Revert change
therobbiedavis Jul 9, 2024
aba719a
More feedback updates
therobbiedavis Jul 9, 2024
2fbdca8
Fixing bulk component
therobbiedavis Jul 9, 2024
a73ddbc
Small fix for e-ink theme
therobbiedavis Jul 10, 2024
4953a81
Feedback update 3
therobbiedavis Jul 10, 2024
6aa78b1
Implemented the ability for Kavita to pick and save primary/secondary…
majora2007 Jul 11, 2024
8a7f3df
Rendering of the colored canvas is now working properly (but still ha…
majora2007 Jul 12, 2024
67f5bff
Fixed a bug where page color wasn't getting unset during page navigat…
majora2007 Jul 12, 2024
4456ae9
Refactored how the background colorscape is applied to use css variab…
majora2007 Jul 12, 2024
52f7328
Refactored the offset calculation to be tweakable by themes.
majora2007 Jul 12, 2024
59ae333
Got the ordering working for color selection. Secondary color isn't c…
majora2007 Jul 12, 2024
5a1180b
Converted card actionables to control flow
majora2007 Jul 13, 2024
8880c86
Added some more test cases for validation on backend. Updated the the…
majora2007 Jul 13, 2024
ab307c8
Added some more test cases for validation on backend.
majora2007 Jul 13, 2024
753c2ec
Fixed a regression on login page with control flow. Ensure that the c…
majora2007 Jul 13, 2024
25fa226
Implemented the ability to transition dynamically from one colorscape…
majora2007 Jul 13, 2024
2e8727f
Cleaned up the code and started working on the opacity that Plex has …
majora2007 Jul 13, 2024
3617222
Implemented hooks so that when a cover update occurs, the UI reloads …
majora2007 Jul 14, 2024
cfd454d
Fixed some parsing bugs around the default colors no longer being in …
majora2007 Jul 14, 2024
eac13ef
Refactored colorscape service to use types as much as possible. If we…
majora2007 Jul 14, 2024
669fb92
Added code to help build light theme colorscapes but after testing, t…
majora2007 Jul 14, 2024
01401eb
Removed some debug code. Colorspaces are done. Moving on.
majora2007 Jul 14, 2024
f45a623
Fixed a bug in theme manager where the active pill wouldn't have the …
majora2007 Jul 14, 2024
ec48164
Refactored the user preferences code to its own component to prepare …
majora2007 Jul 14, 2024
463c3e2
User preferences "dashboard" is now all individual components and rea…
majora2007 Jul 14, 2024
f7ff435
Aligned the admin dashboard to use defer tags like user preferences.
majora2007 Jul 14, 2024
70e7adf
Step 1: When on a preference page, the default side nav will not show.
majora2007 Jul 14, 2024
8b449fa
Converted current side nav to control flow syntax
majora2007 Jul 14, 2024
ece0a11
Changed the active side nav item to have transparent background.
majora2007 Jul 14, 2024
fb37820
Hooked up the admin section so that it can activate the correct routes.
majora2007 Jul 14, 2024
374a13f
Refactored side-nav-item to be able to handle fragments.
majora2007 Jul 14, 2024
a8f81ed
Added a new preference page to handle all the logic. Refactored the n…
majora2007 Jul 14, 2024
c8192df
New settings page is in place and functional. Individual components d…
majora2007 Jul 14, 2024
93f2bcc
Removed dead code and updated links to point to the updated urls.
majora2007 Jul 14, 2024
da29ec8
Started redesigning a component for settings page.
majora2007 Jul 15, 2024
e8dac72
Made the filter icon a bit more stylistic.
majora2007 Jul 15, 2024
7963483
Fixed up the hover area for a jummp key
majora2007 Jul 15, 2024
a6ab814
Control flow card detail layout as much as possible. Still not possib…
majora2007 Jul 15, 2024
3e8f37f
Cleaned up the logic for resuming position on library-detail and the …
majora2007 Jul 15, 2024
9d544a6
Some cleanup to the html
majora2007 Jul 15, 2024
9746582
Converted Scrobble Tokens to new UX and changed up the edit flow slig…
majora2007 Jul 15, 2024
4e8e629
Converted Manage Email (need a Robbie css pass)
majora2007 Jul 15, 2024
01adecb
Account settings page is converted to the new UX (still needs a pass …
majora2007 Jul 15, 2024
3ee8d8f
Control flow updates
majora2007 Jul 15, 2024
a92e157
Added a dedicated setting-title component since the design is the sam…
majora2007 Jul 15, 2024
48890d3
Updated User Preferences page to the new UX. Needs accessibility pass…
majora2007 Jul 16, 2024
9249a9b
Refactored the save mechanic to just be automatically reflecting.
majora2007 Jul 16, 2024
49cdbc3
Refactored all the view modes of user preferences page to use pipes t…
majora2007 Jul 16, 2024
4154e35
Updated settings page to dictate which pages are col-5 or not.
majora2007 Jul 16, 2024
7d29b6c
Cleaned up the Account settings once again with some extra detail.
majora2007 Jul 16, 2024
4be5ab8
Started adding a more customized table implementation for theme and a…
majora2007 Jul 16, 2024
d113ed2
Indented code
majora2007 Jul 17, 2024
c1bc4c3
Added height on series detail to avoid it causing layout shift (does …
majora2007 Jul 17, 2024
7d0a569
Started working on the button styles to match to the new theme system.
majora2007 Aug 5, 2024
6191546
Started working on refactoring device UX.
majora2007 Aug 5, 2024
17e7742
Device UX is finished until Robbie gives more direction.
majora2007 Aug 5, 2024
67dc390
Started to refactor where the Kavita+ screens will live (in their own…
majora2007 Aug 5, 2024
c67e744
Moved metadata breakdown into Kavita+ page (temp) and introduced anot…
majora2007 Aug 5, 2024
8471906
All stats components are now stacked on top of each other. Will revis…
majora2007 Aug 5, 2024
52615f7
Updated Server settings to the new UX pattern.
majora2007 Aug 5, 2024
3dacafd
Cleaned up some bugs from porting.
majora2007 Aug 5, 2024
ff1fa5d
Moved all of the scrobbling stuff into one page. This isn't final, ju…
majora2007 Aug 5, 2024
64a28df
Fixed up the OPDS page to stick to the new style. Styling is broken, …
majora2007 Aug 5, 2024
150e1f2
Removed all cases of hoverable tables from the app.
majora2007 Aug 5, 2024
b37794e
Converted Media settings page over to new UX.
majora2007 Aug 5, 2024
b715cbe
Converted Email settings page over to new UX.
majora2007 Aug 5, 2024
62f26e3
Refactored the devices screen to use a table and a modal for the add/…
majora2007 Aug 5, 2024
504b7f8
Removed table hover class
majora2007 Aug 5, 2024
bdbf4e2
Updated Tasks screen to new UX.
majora2007 Aug 5, 2024
c63b1fa
positioning and css clean up initial pass
therobbiedavis Aug 7, 2024
939b95e
Changed the Cancel wording to Close after you edit a setting item.
majora2007 Aug 6, 2024
1aeba4c
more css updates
therobbiedavis Aug 7, 2024
ddc3026
Updated backend dependencies
majora2007 Aug 7, 2024
08cbbc7
Updated active event counter to use a debounced observable to avoid f…
majora2007 Aug 7, 2024
dfa0742
Reverted Robbie's black background change.
majora2007 Aug 7, 2024
ca080cc
Generic tweaks to the styling on the customize pages.
majora2007 Aug 7, 2024
7f9b598
Removed ngIf from all customize components
majora2007 Aug 7, 2024
d3d51fa
Added a new button class called btn-primary-outline which is the prim…
majora2007 Aug 7, 2024
e671322
Tweaked the styles of btn-secondary-outline
majora2007 Aug 7, 2024
2bdbd80
Merge branch 'feature/revamped-ux' of https://github.com/Kareadita/Ka…
therobbiedavis Aug 7, 2024
21449e3
Changing some preference sizing
therobbiedavis Aug 7, 2024
6e6e4ab
login background, button, hover bg
therobbiedavis Aug 7, 2024
d4b92a9
Tweaked the hover effect for btn-secondary-outline
majora2007 Aug 7, 2024
5a8af01
Recoded the import MAL Stack to a dedicated non-modal component.
majora2007 Aug 7, 2024
d50e91b
Recoded the import CBL to a dedicated non-modal component.
majora2007 Aug 7, 2024
55f2e82
Fixed bad background color on modals.
majora2007 Aug 7, 2024
72afe38
Cleaned up edit user modal for some better spacing.
majora2007 Aug 7, 2024
dff6759
Updated the styles in library-selector.
majora2007 Aug 7, 2024
668f4d5
Updated the styles in role-selector and added a select/deselect all c…
majora2007 Aug 7, 2024
65625ac
Lots of cleanup around manage components
majora2007 Aug 7, 2024
321df68
Updating invite user flow
therobbiedavis Aug 8, 2024
fa1c930
Updating add library flow
therobbiedavis Aug 8, 2024
81fc907
Merged develop in
majora2007 Aug 8, 2024
a4e16dd
Moved the custom button location to be right aligned.
majora2007 Aug 8, 2024
d32f409
A touch of paint across the app and fixed reading lists having non-nu…
majora2007 Aug 8, 2024
058c1b7
Implemented a framework for the preference side nav so that when ther…
majora2007 Aug 8, 2024
27f3b54
Scrobble Error count now shows on pref side nav
majora2007 Aug 8, 2024
f7bd886
Major QoL on manage Users table
majora2007 Aug 8, 2024
c44daf3
Fixed indeterminate checkboxes not showing the primary color.
majora2007 Aug 8, 2024
3c0338c
Converted manage libraries to the table design as well.
majora2007 Aug 8, 2024
9ad260c
Fixing some mobile side-nav issues
therobbiedavis Aug 8, 2024
e11eee8
more side-nav fixes
therobbiedavis Aug 8, 2024
7db43d6
Ensure that the currently selected preference side nav item is in vie…
majora2007 Aug 8, 2024
9c36e60
Trying a new look out for buttons.
majora2007 Aug 8, 2024
590c731
fixing dead space on login page
therobbiedavis Aug 8, 2024
5bd6524
fixing up some styles on task settings
therobbiedavis Aug 8, 2024
6620d78
Apply custom positioning for Add Device button
majora2007 Aug 8, 2024
05acbd5
Update Media Issues to have a date of the issue and removed Details a…
majora2007 Aug 8, 2024
6cc349f
Updated carousel component to remove ngIf
majora2007 Aug 8, 2024
f26a51a
Fixed promote reading list not working from single card actionable.
majora2007 Aug 9, 2024
3bd3f1c
Use a modal to show preview images for theme manager instead of openi…
majora2007 Aug 9, 2024
8a20897
Fixed missing pagination on reading list opds feeds.
majora2007 Aug 9, 2024
dfe69a8
Setting items green text (the view value) is now clickable to switch …
majora2007 Aug 9, 2024
706b814
Added a button to theme manager to allow resetting the form to allow …
majora2007 Aug 9, 2024
bf78608
Minor cleanup
majora2007 Aug 9, 2024
1360458
Reverted series detail actionable being moved.
majora2007 Aug 9, 2024
5855fb0
Added a dedicated task that generates colorscapes if they don't exist…
majora2007 Aug 9, 2024
61afe5e
Removed Home side nav item on default side nav
majora2007 Aug 9, 2024
05b30b4
Fixed the search section not having a good background after tweaking …
majora2007 Aug 9, 2024
af67350
Don't show empty sections on preference side nav
majora2007 Aug 9, 2024
dad46d9
Don't call apis for admins on shared pref sidenav items
majora2007 Aug 9, 2024
bf02bd0
fixing pref side nav spacing
therobbiedavis Aug 9, 2024
70a9293
Fixing theme manager unused height
therobbiedavis Aug 9, 2024
e345148
Fixed no-data on a table not being center aligned.
majora2007 Aug 9, 2024
5be0f0f
Don't show the add button on theme manager when not an admin.
majora2007 Aug 9, 2024
7003212
Fixed an issue where api key was disappearing when clicking show/copy
majora2007 Aug 9, 2024
b071e4e
Made announcements page viewable for all users, not just admins.
majora2007 Aug 9, 2024
4e79a85
Started a crazy idea
majora2007 Aug 9, 2024
fa8c9bc
You can now click off the setting item to close it automatically
majora2007 Aug 9, 2024
047aa06
Fixing theme manager on mobile
therobbiedavis Aug 9, 2024
3a766e3
You can now click off the setting item to close it automatically
majora2007 Aug 9, 2024
7552c7a
Brought back the ability to collapse pref side nav
majora2007 Aug 9, 2024
3442500
Fixed a bad highlight color and fixed 5 missing localization areas.
majora2007 Aug 9, 2024
308b421
Fixed an edge case where busting Kavita+ cache in edit series then hi…
majora2007 Aug 9, 2024
7bf198a
Fixing search and background canvas
therobbiedavis Aug 9, 2024
fcc64f4
Merge branch 'feature/revamped-ux' of https://github.com/Kareadita/Ka…
therobbiedavis Aug 9, 2024
65d7535
Fixed event widget not showing.
majora2007 Aug 9, 2024
442244a
Fixed table not showing sort icons
majora2007 Aug 9, 2024
e297f1c
Fix a weird bootstrap style for switches.
majora2007 Aug 9, 2024
0e1fb2f
Implemented the ability to collapse buttons on manage library page do…
majora2007 Aug 9, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions API/Data/Seed.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ ..new List<SiteTheme>
{
new()
{
Name = "Dark",
NormalizedName = "Dark".ToNormalized(),
Name = "Dark-Material",
NormalizedName = "Dark-Material".ToNormalized(),
Provider = ThemeProvider.System,
FileName = "dark.scss",
FileName = "dark-material.scss",
IsDefault = true,
Description = "Default theme shipped with Kavita"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,9 @@
}

.card {
background-color: var(--primary-color);
background-color: var(--login-card-bg-color);
}

p {
font-family: "League Spartan", sans-serif;
therobbiedavis marked this conversation as resolved.
Show resolved Hide resolved
}
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
{{t('password-validation')}}
</ng-template>
<span class="visually-hidden" id="password-help"><ng-container [ngTemplateOutlet]="passwordTooltip"></ng-container></span>
<input id="password" class="form-control" maxlength="32" minlength="6" pattern="^.{6,32}$" formControlName="password" type="password" aria-describedby="password-help">
<input id="password" class="form-control" maxlength="256" minlength="6" pattern="^.{6,256}$" formControlName="password" type="password" aria-describedby="password-help">
<div id="inviteForm-password-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched">
<div *ngIf="registerForm.get('password')?.errors?.required">
{{t('required-field')}}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
input {
background-color: #fff !important;
color: black !important;
font-family: var(--login-input-font-family);
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export class ConfirmEmailComponent implements OnDestroy {
registerForm: FormGroup = new FormGroup({
email: new FormControl('', [Validators.required]),
username: new FormControl('', [Validators.required]),
password: new FormControl('', [Validators.required, Validators.maxLength(32), Validators.minLength(6), Validators.pattern("^.{6,32}$")]),
password: new FormControl('', [Validators.required, Validators.maxLength(256), Validators.minLength(6), Validators.pattern("^.{6,256}$")]),
});

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
{{t('password-validation')}}
</ng-template>
<span class="visually-hidden" id="password-help"><ng-container [ngTemplateOutlet]="passwordTooltip"></ng-container></span>
<input id="password" class="form-control" maxlength="32" minlength="6" formControlName="password" type="password" aria-describedby="password-help">
<input id="password" class="form-control" maxlength="256" minlength="6" formControlName="password" type="password" aria-describedby="password-help">
<div id="inviteForm-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched">
<div *ngIf="registerForm.get('password')?.errors?.required">
{{t('required-field')}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export class ConfirmResetPasswordComponent {
token: string = '';
registerForm: FormGroup = new FormGroup({
email: new FormControl('', [Validators.required, Validators.email]),
password: new FormControl('', [Validators.required, Validators.maxLength(32), Validators.minLength(6)]),
password: new FormControl('', [Validators.required, Validators.maxLength(256), Validators.minLength(6)]),
});

constructor(private route: ActivatedRoute, private router: Router,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<ng-container body>
<p>{{t('description')}}</p>
<form [formGroup]="registerForm" (ngSubmit)="submit()">
<div class="mb-3">
<div class="mb-3 text-start">
<label for="username" class="form-label">{{t('username-label')}}</label>
<input id="username" class="form-control" formControlName="username" type="text" autocomplete="username"
<input id="username" class="form-control custom-input" formControlName="username" type="text" autocomplete="username"
[class.is-invalid]="registerForm.get('username')?.invalid && registerForm.get('username')?.touched" aria-describedby="username-validations">
<div id="username-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched">
<div *ngIf="registerForm.get('username')?.errors?.required">
Expand All @@ -15,14 +15,14 @@
</div>
</div>

<div class="mb-3" style="width:100%">
<label for="email" class="form-label">{{t('email-label')}}</label>
<div class="mb-3 text-start">
<label for="email" class="form-label float-start">{{t('email-label')}}</label>
<i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="emailTooltip" role="button" tabindex="0"></i>
<ng-template #emailTooltip>{{t('email-tooltip')}}</ng-template>
<span class="visually-hidden" id="email-help">
<ng-container [ngTemplateOutlet]="emailTooltip"></ng-container>
</span>
<input class="form-control" type="email" inputmode="email" id="email" autocomplete="email" formControlName="email" required aria-describedby="email-help"
<input class="form-control custom-input" type="email" inputmode="email" id="email" autocomplete="email" formControlName="email" required aria-describedby="email-help"
[class.is-invalid]="registerForm.get('email')?.invalid && registerForm.get('email')?.touched">
<div id="email-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched">
<div *ngIf="registerForm.get('email')?.errors?.required">
Expand All @@ -34,14 +34,14 @@
</div>
</div>

<div class="mb-3">
<div class="mb-3 text-start">
<label for="password" class="form-label">Password</label>
<i class="fa fa-info-circle ms-1" placement="right" [ngbTooltip]="passwordTooltip" role="button" tabindex="0"></i>
<ng-template #passwordTooltip>
{{t('password-validation')}}
</ng-template>
<span class="visually-hidden" id="password-help"><ng-container [ngTemplateOutlet]="passwordTooltip"></ng-container></span>
<input id="password" class="form-control" maxlength="32" minlength="6" pattern="^.{6,32}$" formControlName="password" autocomplete="new-password"
<input id="password" class="form-control custom-input" maxlength="256" minlength="6" pattern="^.{6,256}$" formControlName="password" autocomplete="new-password"
type="password" aria-describedby="password-help" [class.is-invalid]="registerForm.get('password')?.invalid && registerForm.get('password')?.touched">
@if (registerForm.dirty || registerForm.touched) {
<div id="password-validations" class="invalid-feedback">
Expand All @@ -55,8 +55,8 @@
}
</div>

<div class="float-end">
<button class="btn btn-secondary alt" type="submit" [disabled]="!registerForm.valid">{{t('register')}}</button>
<div>
<button class="btn btn-primary" type="submit" [disabled]="!registerForm.valid">{{t('register')}}</button>
</div>
</form>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,35 @@
input {
background-color: #fff !important;
color: black !important;
.custom-input {
background-color: var(--login-input-background-color);
color: var(--login-input-color);
border-color: var(--login-input-border-color);
font-family: var(--login-input-font-family);

&.is-invalid {
border-color: var(--bs-form-invalid-border-color);
}

&:focus {
border-color: var(--login-input-border-color-focus);
box-shadow: var(--login-input-box-shadow-focus);
}

&::placeholder {
opacity: 0.5;
color: var(--login-input-placeholder-color);
therobbiedavis marked this conversation as resolved.
Show resolved Hide resolved
font-family: var(--login-input-font-family);
}
}

label {
font-family: var(--login-input-font-family);
margin-bottom: 0;
}

p {
font-family: var(--login-input-font-family);
}

.btn {
width: 100%;
font-family: var(--login-input-font-family);
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ export class RegisterComponent {
registerForm: FormGroup = new FormGroup({
email: new FormControl('', [Validators.required]),
username: new FormControl('', [Validators.required]),
password: new FormControl('', [Validators.required, Validators.maxLength(32),
Validators.minLength(6), Validators.pattern("^.{6,32}$")]),
password: new FormControl('', [Validators.required, Validators.maxLength(256),
Validators.minLength(6), Validators.pattern("^.{6,256}$")]),
});

private readonly navService = inject(NavService);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<p>{{t('description')}}</p>
<form [formGroup]="registerForm" (ngSubmit)="submit()">
<div class="mb-3" style="width:100%">
<label for="email" class="form-label">Email</label>
<input class="form-control custom-input" type="email" inputmode="email" id="email" formControlName="email" [class.is-invalid]="registerForm.get('email')?.invalid && registerForm.get('email')?.touched">
<label for="email" class="form-label visually-hidden">{{t('email-label')}}</label>
<input class="form-control custom-input" type="email" inputmode="email" id="email" formControlName="email" [class.is-invalid]="registerForm.get('email')?.invalid && registerForm.get('email')?.touched" [placeholder]="t('email-label')">
<div id="inviteForm-validations" class="invalid-feedback" *ngIf="registerForm.dirty || registerForm.touched">
<div *ngIf="registerForm.get('email')?.errors?.required">
{{t('required-field')}}
Expand All @@ -18,7 +18,7 @@
</div>

<div>
<button class="btn btn-secondary alt" type="submit">{{t('submit')}}</button>
<button class="btn btn-primary" type="submit">{{t('submit')}}</button>
</div>
</form>
</ng-container>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,26 @@
.btn {
width: 100%
width: 100%;
font-family: var(--login-input-font-family);
}

.custom-input {
background-color: #fff !important;
color: black !important;
background-color: var(--login-input-background-color);
color: var(--login-input-color);
border-color: var(--login-input-border-color);
font-family: var(--login-input-font-family);

&:focus {
border-color: var(--login-input-border-color-focus);
box-shadow: var(--login-input-box-shadow-focus);
}

&::placeholder {
opacity: 0.5;
color: var(--login-input-placeholder-color);
font-family: var(--login-input-font-family);
}
}

p {
font-family: var(--login-input-font-family);
}
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
<div class="mx-auto login" [ngStyle]="{'height': (navService.navbarVisible$ | async) ? 'calc(var(--vh, 1vh) * 100 - 57px)' : 'calc(var(--vh, 1vh) * 100)'}">
<div class="mx-auto container login text-center"
[ngStyle]="{'height': (navService.navbarVisible$ | async) ? 'calc(var(--vh, 1vh) * 100 - 57px)' : 'calc(var(--vh, 1vh) * 100)'}">
therobbiedavis marked this conversation as resolved.
Show resolved Hide resolved

<div class="row row-cols-4 row-cols-md-4 row-cols-sm-2 row-cols-xs-2">
<div class="col align-self-center card p-3">
<div class="row align-items-center row-cols-1 logo-container mb-3 justify-content-center">
<div class="col col-md-4 col-sm-12 col-xs-12 align-self-center p-0">
<div class="row align-items-center row-cols-1 justify-content-center">
<div class="col col-lg-8 col-md-10 col-sm-10 col-xs-10 p-0 position-relative">
<div class="justify-content-center">
<div class="logo"></div>
<h2>Kavita</h2>
therobbiedavis marked this conversation as resolved.
Show resolved Hide resolved
</div>
</div>
</div>
</div>

</div>
<div class="row align-items-center row-cols-1 login-container justify-content-center">
<div class="col col-xl-2 col-lg-3 col-md-3 col-sm-10 col-xs-10 align-self-center card p-3">
<span>
<div class="logo-container">
<h3 class="card-title text-center">
<div class="card-title text-center">
<ng-content select="[title]"></ng-content>
majora2007 marked this conversation as resolved.
Show resolved Hide resolved
</h3>
</div>
</div>
</span>

Expand All @@ -17,4 +31,4 @@ <h3 class="card-title text-center">

</div>

</div>
</div>
Original file line number Diff line number Diff line change
Expand Up @@ -2,50 +2,74 @@
display: flex;
align-items: center;
justify-content: center;
flex-direction: column;
height: calc(var(--vh, 1vh) * 100 - 57px);
min-height: 289px;
position: relative;
width: 100vw;
max-width: 100vw;


&::before {
content: "";
background-image: url('../../../../assets/images/login-bg.jpg');
background-size: cover;
background-image: var(--login-background-url);
background-size: var(--login-background-size);
position: absolute;
top: 0;
right: 0;
bottom: 0;
opacity: 0.1;
opacity: var(--login-background-opacity);
width: 100%;
}

h2 {
font-family: "Spartan", sans-serif;
font-size: 1.5rem;
margin-bottom: 0;
font-weight: bold;
display: inline-block;
margin-left: 5px;
vertical-align: middle;
}

.logo-container {
width: 100%;
.logo {
display:inline-block;
height: 50px;
width: var(--login-logo-width);
height: var(--login-logo-height);
background-image: var(--login-logo-image);
background-size: var(--login-logo-bg-size);
background-repeat: var(--login-logo-bg-repeat);
display: inline-block;
vertical-align: middle;
}
}

.login-container {
width: 100%;
}

.card {
background-color: var(--primary-color);
background-color: var(--login-card-bg-color);
color: #fff;
min-width: 300px;
max-width: 12rem;
max-width: 300px;
border-width: var(--login-card-border-width);
border-style: var(--login-card-border-style);
border-color: var(--login-card-border-color);

&:focus {
border: 2px solid white;

}


.card-title {
font-family: 'Spartan', sans-serif;
font-weight: bold;
display: inline-block;
vertical-align: middle;
width: 100%;
::ng-deep.card-title {
h2 {
font-family: 'Poppins', sans-serif;
display: inline-block;
vertical-align: middle;
width: 100%;
font-size: 1rem;
}
}

.card-text {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
id="password" type="password" [placeholder]="t('password')">
</div>

<div class="mb-3">
<a routerLink="/registration/reset-password" style="color: white">{{t('forgot-password')}}</a>
<div class="mb-3 forgot-password">
<a routerLink="/registration/reset-password">{{t('forgot-password')}}</a>
</div>

<div>
<button class="btn btn-secondary alt" type="submit" [disabled]="isSubmitting">{{t('submit')}}</button>
<div class="sign-in">
<button class="btn btn-outline-primary" type="submit" [disabled]="isSubmitting">{{t('submit')}}</button>
</div>
</div>
</form>
Expand Down
Loading
Loading