Skip to content

Commit

Permalink
Fix import color box (#263)
Browse files Browse the repository at this point in the history
* fix: layout color box in import

* fix: dep. versions
  • Loading branch information
HenryT-CG authored Sep 27, 2024
1 parent c4f2edc commit 490f433
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 25 deletions.
40 changes: 24 additions & 16 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,13 @@
"@openapitools/openapi-generator-cli": "^2.13.4",
"@schematics/angular": "^18.2.5",
"@types/jasmine": "~5.1.4",
"@types/node": "22.6.1",
"@types/node": "22.7.3",
"@typescript-eslint/eslint-plugin": "7.18.0",
"@typescript-eslint/parser": "7.18.0",
"css-loader": "^7.1.2",
"eslint": "~8.57.0",
"eslint-config-prettier": "9.1.0",
"eslint-plugin-import": "2.29.1",
"eslint-plugin-import": "2.30.0",
"eslint-plugin-prettier": "^5.2.1",
"husky": "^9.1.6",
"jasmine-core": "~5.2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
}
// height of a normal text input control
.h-inputtext {
height: 2.786rem;
height: 2.786rem !important;
}
}
12 changes: 6 additions & 6 deletions src/app/theme/theme-import/theme-import.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@
[cancelLabel]="'ACTIONS.CANCEL' | translate"
[chooseLabel]="'ACTIONS.CHOOSE' | translate"
></p-fileUpload>
<div *ngIf="themeSnapshot" class="flex flex-wrap justify-content-start align-items-center gap-2 mt-4">
<span class="p-float-label" controlErrorAnchor>
<div *ngIf="themeSnapshot" class="flex flex-wrap justify-content-start align-items-center gap-3 mt-4">
<span class="p-float-label w-full md:w-15rem" controlErrorAnchor>
<input
pInputText
type="text"
id="th_import_theme_name"
class="w-full pt-3 pb-2"
class="w-full pt-3 pb-2 text-responsive"
[(ngModel)]="themeName"
(ngModelChange)="checkThemeExistence()"
(keyup)="checkThemeExistence()"
Expand All @@ -41,12 +41,12 @@
/>
<label class="ocx-required-label" for="th_import_theme_name">{{ 'THEME.THEME_NAME' | translate }}</label>
</span>
<span class="p-float-label" controlErrorAnchor>
<span class="p-float-label w-full md:w-15rem" controlErrorAnchor>
<input
pInputText
type="text"
id="th_import_theme_display_name"
class="w-full pt-3 pb-2"
class="w-full pt-3 pb-2 text-responsive"
[(ngModel)]="displayName"
(ngModelChange)="checkThemeExistence()"
(keyup)="checkThemeExistence()"
Expand All @@ -58,7 +58,7 @@
{{ 'THEME.DISPLAY_NAME' | translate }}
</label>
</span>
<app-theme-color-box *ngIf="properties" [properties]="properties" />
<app-theme-color-box *ngIf="properties" [properties]="properties" styleClass="h-inputtext w-15rem" />
<div *ngIf="!properties">{{ 'THEME.NO_PROPERTIES' | translate }}</div>
</div>
<p-message
Expand Down
1 change: 1 addition & 0 deletions src/app/theme/theme-import/theme-import.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@

@include correct-file-upload;
@include dialog-footer-buttons;
@include displaying-text-responsive;

0 comments on commit 490f433

Please sign in to comment.