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

feat(theme): adicionado melhoria no tema para diferentes acessibilidades #2331

Merged
merged 1 commit into from
Dec 11, 2024
Merged

feat(theme): adicionado melhoria no tema para diferentes acessibilidades #2331

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
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ speed-measure-plugin.json
.vscode

# IDE - VSCode
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
Expand All @@ -35,6 +36,7 @@ speed-measure-plugin.json
.history/*

# misc
.angular
/.angular/cache
/.sass-cache
/connect.lock
Expand Down
1 change: 0 additions & 1 deletion projects/app/src/app/app.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';

import { PoModule } from '@po-ui/ng-components';

import { AppComponent } from './app.component';

@NgModule({
Expand Down
7 changes: 3 additions & 4 deletions projects/portal/src/app/app.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ export class AppComponent implements OnInit, OnDestroy {
private poTheme: PoThemeService,
public router: Router
) {
const _poTheme = this.poTheme.persistThemeActive();
const _poTheme = this.poTheme.applyTheme();
if (!_poTheme) {
this.theme = poThemeConstant.active;
this.poTheme.setTheme(poThemeConstant, this.theme);
} else {
this.theme = _poTheme.active || 0;
this.theme = typeof _poTheme.active === 'object' ? _poTheme.active.type : _poTheme.active;
}

this.poTheme.setTheme(poThemeConstant, this.theme);
}

async ngOnInit() {
Expand Down
4 changes: 0 additions & 4 deletions projects/portal/src/app/theme-builder/theme-builder.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,10 +238,6 @@ p {
}
}

.widget-items > .po-widget {
height: 255px;
}

.widget-color > .po-widget {
background-color: var(--color-neutral-light-10);
}
Expand Down
2 changes: 1 addition & 1 deletion projects/portal/src/app/theme-builder/theme-builder.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
<po-menu-filter class="menu-filter"></po-menu-filter>
</div>
</div> -->
<div class="po-row po-p-0 po-mt-2 po-mb-3">
<div class="po-row po-p-0 po-mt-2 po-mb-3" style="row-gap: 8px">
<po-widget [class.hide]="!botaoPrimaryView" class="widget-items po-sm-12 po-md-6 po-lg-4 po-xl-3 po-pl-0">
<po-widget class="widget-menu">
<div class="po-row row-menu">
Expand Down
109 changes: 58 additions & 51 deletions projects/ui/src/lib/components/po-field/po-combo/po-combo.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,60 +7,67 @@
[p-required]="required"
[p-show-required]="showRequired"
>
<div cdkOverlayOrigin #trigger="cdkOverlayOrigin" class="po-field-container-content po-combo-container-content">
<div *ngIf="icon" class="po-field-icon-container-left">
<po-icon
class="po-field-icon po-icon-input"
[class.po-field-icon-disabled]="disabled"
[p-icon]="icon"
></po-icon>
</div>
<div
#searchContainer
cdkOverlayOrigin
#trigger="cdkOverlayOrigin"
class="po-field-container-content po-combo-container-content"
>
<div class="po-combo-container-wrapper">
<div *ngIf="icon" class="po-field-icon-container-left">
<po-icon
class="po-field-icon po-icon-input"
[class.po-field-icon-disabled]="disabled"
[p-icon]="icon"
></po-icon>
</div>

<input
#inp
class="po-combo-input"
[ngClass]="clean && inp.value ? 'po-input-double-icon-right' : 'po-input-icon-right'"
[class.po-input-icon-left]="icon"
autocomplete="off"
type="text"
[attr.name]="name"
[disabled]="disabled"
[id]="id"
[placeholder]="disabled ? '' : placeholder"
[required]="required"
(click)="toggleComboVisibility()"
(keyup)="onKeyUp($event)"
(blur)="onBlur()"
(keyup)="searchOnEnterOrArrow($event, $event.target.value)"
(keydown)="onKeyDown($event)"
/>
<input
#inp
class="po-combo-input"
[ngClass]="clean && inp.value ? 'po-input-double-icon-right' : 'po-input-icon-right'"
[class.po-input-icon-left]="icon"
autocomplete="off"
type="text"
[attr.name]="name"
[disabled]="disabled"
[id]="id"
[placeholder]="disabled ? '' : placeholder"
[required]="required"
(click)="toggleComboVisibility()"
(keyup)="onKeyUp($event)"
(blur)="onBlur()"
(keyup)="searchOnEnterOrArrow($event, $event.target.value)"
(keydown)="onKeyDown($event)"
/>

<div class="po-field-icon-container-right">
<po-clean
tabindex="0"
role="button"
[attr.aria-label]="literals.clean"
class="po-combo-clean po-icon-input"
*ngIf="clean && !disabled && inp.value"
[p-element-ref]="inputEl"
(p-change-event)="clear($event)"
(click)="clear(null); $event.preventDefault()"
(keydown.enter)="clearAndFocus(); $event.preventDefault()"
>
</po-clean>
<div class="po-field-icon-container-right">
<po-clean
tabindex="0"
role="button"
[attr.aria-label]="literals.clean"
class="po-combo-clean po-icon-input"
*ngIf="clean && !disabled && inp.value"
[p-element-ref]="inputEl"
(p-change-event)="clear($event)"
(click)="clear(null); $event.preventDefault()"
(keydown.enter)="clearAndFocus(); $event.preventDefault()"
>
</po-clean>

<div
#iconArrow
class="po-combo-arrow po-field-icon"
[class.po-field-icon-disabled]="disabled"
(click)="toggleComboVisibility(true)"
>
<po-icon
[p-icon]="comboOpen ? 'ICON_ARROW_UP po-icon-input' : 'ICON_ARROW_DOWN po-icon-input'"
[class.po-field-icon]="!disabled"
[class.po-combo-default-border]="!disabled && inp.value"
[class.po-combo-background-arrow-up]="!disabled && comboOpen"
></po-icon>
<div
#iconArrow
class="po-combo-arrow po-field-icon"
[class.po-field-icon-disabled]="disabled"
(click)="toggleComboVisibility(true)"
>
<po-icon
[p-icon]="comboOpen ? 'ICON_ARROW_UP po-icon-input' : 'ICON_ARROW_DOWN po-icon-input'"
[class.po-field-icon]="!disabled"
[class.po-combo-default-border]="!disabled && inp.value"
[class.po-combo-background-arrow-up]="!disabled && comboOpen"
></po-icon>
</div>
</div>
</div>
</div>
Expand Down
112 changes: 58 additions & 54 deletions ...cts/ui/src/lib/components/po-field/po-datepicker-range/po-datepicker-range.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,64 +6,68 @@
[p-required]="required"
[p-show-required]="showRequired"
>
<div
#dateRangeField
class="po-datepicker-range-field po-input"
[class.po-datepicker-range-field-disabled]="disabled"
[attr.disabled]="disabled"
>
<div class="po-datepicker-range-start-date">
<input
#startDateInput
class="po-datepicker-range-input"
maxlength="10"
type="text"
[attr.aria-label]="label"
[autocomplete]="autocomplete"
[disabled]="disabled"
[name]="startDateInputName"
[readonly]="readonly"
(blur)="onBlur($event)"
(focus)="onFocus($event)"
(keydown)="onKeydown($event)"
(keyup)="onKeyup($event)"
(click)="eventOnClick($event)"
/>
</div>
<div class="po-field-container-content">
<div class="po-field-container-input">
<div
#dateRangeField
class="po-datepicker-range-field po-input"
[class.po-datepicker-range-field-disabled]="disabled"
[attr.disabled]="disabled"
>
<div class="po-datepicker-range-start-date">
<input
#startDateInput
class="po-datepicker-range-input"
maxlength="10"
type="text"
[attr.aria-label]="label"
[autocomplete]="autocomplete"
[disabled]="disabled"
[name]="startDateInputName"
[readonly]="readonly"
(blur)="onBlur($event)"
(focus)="onFocus($event)"
(keydown)="onKeydown($event)"
(keyup)="onKeyup($event)"
(click)="eventOnClick($event)"
/>
</div>

<div class="po-datepicker-range-separator">-</div>
<div class="po-datepicker-range-separator">-</div>

<div class="po-datepicker-range-end-date">
<input
#endDateInput
class="po-datepicker-range-input"
maxlength="10"
type="text"
[autocomplete]="autocomplete"
[disabled]="disabled"
[name]="endDateInputName"
[readonly]="readonly"
(blur)="onBlur($event)"
(focus)="onFocus($event)"
(keydown)="onKeydown($event)"
(keyup)="onKeyup($event)"
(click)="eventOnClick($event)"
/>
</div>
<div class="po-datepicker-range-end-date">
<input
#endDateInput
class="po-datepicker-range-input"
maxlength="10"
type="text"
[autocomplete]="autocomplete"
[disabled]="disabled"
[name]="endDateInputName"
[readonly]="readonly"
(blur)="onBlur($event)"
(focus)="onFocus($event)"
(keydown)="onKeydown($event)"
(keyup)="onKeyup($event)"
(click)="eventOnClick($event)"
/>
</div>

<div class="po-datepicker-range-icon">
<po-clean class="po-icon-input" *ngIf="enableCleaner" (p-change-event)="clear()"></po-clean>
</div>
<div class="po-datepicker-range-icon">
<po-clean class="po-icon-input" *ngIf="enableCleaner" (p-change-event)="clear()"></po-clean>
</div>

<div class="po-datepicker-range-icon">
<po-icon
#iconCalendar
[p-icon]="!disabled || !readonly ? 'ICON_CALENDAR po-clickable' : 'ICON_CALENDAR'"
class="po-field-icon {{ disabled ? 'po-icon-input-disabled' : 'po-icon-input' }}"
[class.po-field-icon-disabled]="disabled || readonly"
(click)="toggleCalendar()"
>
</po-icon>
<div class="po-datepicker-range-icon">
<po-icon
#iconCalendar
[p-icon]="!disabled || !readonly ? 'ICON_CALENDAR po-clickable' : 'ICON_CALENDAR'"
class="po-field-icon {{ disabled ? 'po-icon-input-disabled' : 'po-icon-input' }}"
[class.po-field-icon-disabled]="disabled || readonly"
(click)="toggleCalendar()"
>
</po-icon>
</div>
</div>
</div>
</div>

Expand Down
Loading
Loading