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.

Sign up for GitHub

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

Jump to bottom

fixed ui issue and content overlapping on login screen #2053

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed ui issue and content overlapping on login screen #2053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions src/app/login/login.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,9 @@ <h1 class="mat-display-1 cover-title">{{ 'APP_NAME' | translate}}</h1>
<div fxLayout="column" fxFlex.gt-md="1 0 30%" class="login-container">

<!-- Language Selector to the extreme right -->
<div fxLayout="row-reverse" fxFlex="1 0 auto">
<mifosx-language-selector class="p-r-10 p-t-10"></mifosx-language-selector>
<div fxLayout="row-reverse" fxFlex="1 0 auto" fxLayoutAlign="center center">
<mifosx-language-selector class=" p-t-10"></mifosx-language-selector>
<mifosx-theme-toggle class="p-r-10 p-t-10"></mifosx-theme-toggle>
<div fxFlex></div>
<mifosx-server-selector class="p-l-10 p-t-10" *ngIf="environment.allowServerSwitch"></mifosx-server-selector>
</div>

Expand Down
45 changes: 44 additions & 1 deletion src/app/settings/settings.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,54 @@ import { UntypedFormControl } from '@angular/forms';
})
export class SettingsComponent implements OnInit {

/** Placeholder for languages. update once translations are set up */
languages: any[] = [
{
name: 'Čeština (Czech)',
code: 'cs'
},
{
name: 'Deutsch (German)',
code: 'de'
},
{
name: 'English',
code: 'en'
},
{
name: 'Español (Spanish)',
code: 'es'
},
{
name: 'Français (French)',
code: 'fr'
},
{
name: 'Italiano (Italian)',
code: 'it'
},
{
name: '한국어 (Korean)',
code: 'ko'
},
{
name: 'Lietuvių (Lithuanian)',
code: 'lt'
},
{
name: 'Latviešu (Latvian)',
code: 'lv'
},
{
name: 'नेपाली (Nepali)',
code: 'ne'
},
{
name: 'Português (Portuguese)',
code: 'pt'
},
{
name: 'Kiswahili (Swahili)',
code: 'sw'
}
];
/** Date formats. */
Expand Down