Skip to content

Commit

Permalink
prime: get rid of bootstrap
Browse files Browse the repository at this point in the history
Co-Authored-by: Johnny Mariéthoz <[email protected]>
  • Loading branch information
jma and jma committed Oct 31, 2024
1 parent a9b2684 commit 50be9e2
Show file tree
Hide file tree
Showing 60 changed files with 618 additions and 1,192 deletions.
43 changes: 4 additions & 39 deletions package-lock.json

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

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"@ngx-translate/core": "^15.0.0",
"@ngx-translate/http-loader": "^8.0.0",
"@types/marked": "^4.0.8",
"bootstrap": "^4.6.2",
"crypto-js": "^4.2.0",
"easymde": "^2.18.0",
"font-awesome": "^4.7.0",
Expand Down
10 changes: 7 additions & 3 deletions projects/ng-core-tester/src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -370,20 +370,24 @@ const routes: Routes = [
{
label: 'Relevance',
value: 'relevance',
defaultQuery: true
defaultQuery: true,
icon: 'fa-sort-amount-desc'
},
{
label: 'Date descending',
value: 'newest',
defaultNoQuery: true
defaultNoQuery: true,
icon: 'fa-sort-amount-desc'
},
{
label: 'Date ascending',
value: 'oldest',
icon: 'fa-sort-amount-asc'
},
{
label: 'Title',
value: 'title'
value: 'title',
icon: 'fa-sort-alpha-asc'
}
],
exportFormats: [
Expand Down
14 changes: 14 additions & 0 deletions projects/ng-core-tester/src/app/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,17 @@
<input pInputText class="w-full" type="text" id="markdown" value="*Hello* **world**" [(ngModel)]="markdownText">
<div class="my-3" [innerHTML]="markdownText | markdown"></div>
</p-panel>

<p-panel header="Text Read More" styleClass="mt-3">
<ng-core-text-read-more
text="Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. "
[unit]="'character'"
[limit]="10"
[showMoreLabel]="'Show more' | translate"
[showLessLabel]="'Show less' | translate"
/>
</p-panel>

<p-panel header="Error" styleClass="mt-3">
<ng-core-error [error]="{title: 'title', status: 'error'}"/>
</p-panel>
4 changes: 2 additions & 2 deletions projects/ng-core-tester/src/app/menu/menu.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
}
<span class="ml-2">{{ item.label }}</span>
@if (item.badge) {
<p-badge [ngClass]="{ 'ml-auto': !root, 'ml-2': root }" [value]="item.badge"></p-badge>
<p-badge [ngClass]="{ 'ml-auto': !root, 'ml-2': root }" [value]="item.badge"/>
}
@if (item.shortcut) {
<span class="ml-auto border-1 surface-border border-round surface-100 text-xs p-1">{{ item.shortcut }}</span>
Expand All @@ -42,7 +42,7 @@
}
<span class="ml-2">{{ item.label }}</span>
@if (item.badge) {
<p-badge [ngClass]="{ 'ml-auto': !root, 'ml-2': root }" [value]="item.badge"></p-badge>
<p-badge [ngClass]="{ 'ml-auto': !root, 'ml-2': root }" [value]="item.badge"/>
}
@if (item.shortcut) {
<span class="ml-auto border-1 surface-border border-round surface-100 text-xs p-1">{{ item.shortcut }}</span>
Expand Down
3 changes: 0 additions & 3 deletions projects/ng-core-tester/src/app/menu/menu.component.scss

This file was deleted.

3 changes: 1 addition & 2 deletions projects/ng-core-tester/src/app/menu/menu.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import { MenuItem, MessageService } from 'primeng/api';

@Component({
selector: 'app-menu',
templateUrl: './menu.component.html',
styleUrl: './menu.component.scss'
templateUrl: './menu.component.html'
})
export class MenuComponent implements OnInit {

Expand Down
40 changes: 20 additions & 20 deletions projects/ng-core-tester/src/app/record/editor/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
"formlyConfig": {
"type": "textarea",
"props": {
"rows": 3
"grids": 3
}
}
}
Expand Down Expand Up @@ -169,18 +169,18 @@
"title": "Name",
"type": "string",
"minLength": 3,
"className": "col-lg-6"
"className": "lg:col-6"
},
"hidden": {
"title": "Hidden name",
"type": "string",
"minLength": 3,
"className": "col-lg-6",
"className": "lg:col-6",
"widget": {
"formlyConfig": {
"props": {
"hide": true,
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
Expand All @@ -203,7 +203,7 @@
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row"
"containerCssClass": "grid"
}
}
}
Expand All @@ -218,7 +218,7 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
Expand All @@ -232,7 +232,7 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
Expand All @@ -244,7 +244,7 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
Expand All @@ -253,7 +253,7 @@
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row"
"containerCssClass": "grid"
}
}
}
Expand Down Expand Up @@ -325,7 +325,7 @@
"widget": {
"formlyConfig": {
"props": {
"cssClass": "w-md-50"
"cssClass": "w-6"
}
}
}
Expand Down Expand Up @@ -407,7 +407,7 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-md-6"
"itemCssClass": "md:col-6"
}
}
}
Expand All @@ -419,7 +419,7 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-md-6"
"itemCssClass": "md:col-6"
}
}
}
Expand All @@ -428,7 +428,7 @@
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row",
"containerCssClass": "grid",
"hideLabel": true
}
}
Expand Down Expand Up @@ -484,15 +484,15 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
},
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row"
"containerCssClass": "grid"
}
}
}
Expand All @@ -508,15 +508,15 @@
"widget": {
"formlyConfig": {
"props": {
"itemCssClass": "col-lg-6"
"itemCssClass": "lg:col-6"
}
}
}
},
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row"
"containerCssClass": "grid"
}
}
}
Expand Down Expand Up @@ -570,7 +570,7 @@
"widget": {
"formlyConfig": {
"props": {
"containerCssClass": "row"
"containerCssClass": "grid"
}
}
}
Expand Down Expand Up @@ -1204,7 +1204,7 @@
"displayWords": true,
"limitChars": 200,
"limitWords": 10,
"rows": 5
"grids": 5
}
}
}
Expand Down Expand Up @@ -1541,7 +1541,7 @@
"formlyConfig": {
"type": "textarea",
"props": {
"rows": 5
"grids": 5
}
}
}
Expand Down
Loading

0 comments on commit 50be9e2

Please sign in to comment.