diff --git a/src/app/demo/components/auth/login/login.component.html b/src/app/demo/components/auth/login/login.component.html index 86dc54e..45c3955 100644 --- a/src/app/demo/components/auth/login/login.component.html +++ b/src/app/demo/components/auth/login/login.component.html @@ -1,24 +1,22 @@ -
-
-
- Sakai logo -
-
-
+
+
+ Sakai logo +
+
Image
Welcome, Isabel!
Sign in to continue
-
+
- + - + -
+
diff --git a/src/app/demo/components/auth/login/login.component.ts b/src/app/demo/components/auth/login/login.component.ts index 0d65c52..6a30f8b 100644 --- a/src/app/demo/components/auth/login/login.component.ts +++ b/src/app/demo/components/auth/login/login.component.ts @@ -5,18 +5,8 @@ import { LayoutService } from 'src/app/layout/service/app.layout.service'; selector: 'app-login', templateUrl: './login.component.html', styles: [` - :host ::ng-deep .p-password input { - width: 100%; - padding:1rem; - } - - :host ::ng-deep .pi-eye{ - transform:scale(1.6); - margin-right: 1rem; - color: var(--primary-color) !important; - } - - :host ::ng-deep .pi-eye-slash{ + :host ::ng-deep .pi-eye, + :host ::ng-deep .pi-eye-slash { transform:scale(1.6); margin-right: 1rem; color: var(--primary-color) !important; diff --git a/src/app/demo/components/landing/landing.component.html b/src/app/demo/components/landing/landing.component.html index 59847ae..a274f50 100644 --- a/src/app/demo/components/landing/landing.component.html +++ b/src/app/demo/components/landing/landing.component.html @@ -7,25 +7,25 @@ - -
+

Eu sem integereget magna fermentum

Sed blandit libero volutpat sed cras. Fames ac turpis egestas integer. Placerat in egestas erat...

- +
+ Hero Image +
@@ -216,7 +219,7 @@
-
+

Free

free
@@ -247,7 +250,7 @@
-
+

Startup

startup
@@ -278,7 +281,7 @@
-
+

Enterprise

enterprise
diff --git a/src/app/demo/components/landing/landing.component.ts b/src/app/demo/components/landing/landing.component.ts index 5075067..b10d35d 100644 --- a/src/app/demo/components/landing/landing.component.ts +++ b/src/app/demo/components/landing/landing.component.ts @@ -4,60 +4,10 @@ import { LayoutService } from 'src/app/layout/service/app.layout.service'; @Component({ selector: 'app-landing', - templateUrl: './landing.component.html', - styles: [` - #hero{ - background: linear-gradient(0deg, rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2)), radial-gradient(77.36% 256.97% at 77.36% 57.52%, #EEEFAF 0%, #C3E3FA 100%); - height:700px; - overflow:hidden; - } - - .pricing-card:hover{ - border:2px solid var(--cyan-200) !important; - } - - @media screen and (min-width: 768px) { - #hero{ - -webkit-clip-path: ellipse(150% 87% at 93% 13%); - clip-path: ellipse(150% 87% at 93% 13%); - height: 530px; - } - } - - @media screen and (min-width: 1300px){ - #hero > img { - position: absolute; - transform:scale(1.2); - top:15%; - } - - #hero > div > p { - max-width: 450px; - } - } - - @media screen and (max-width: 1300px){ - #hero { - height: 600px; - } - - #hero > img { - position:static; - transform: scale(1); - margin-left: auto; - } - - #hero > div { - width: 100%; - } - - #hero > div > p { - width: 100%; - max-width: 100%; - } - } - `] + templateUrl: './landing.component.html' }) export class LandingComponent { + constructor(public layoutService: LayoutService, public router: Router) { } + } diff --git a/src/app/demo/components/uikit/button/buttondemo.component.html b/src/app/demo/components/uikit/button/buttondemo.component.html index 236543c..1a3aac4 100644 --- a/src/app/demo/components/uikit/button/buttondemo.component.html +++ b/src/app/demo/components/uikit/button/buttondemo.component.html @@ -2,43 +2,51 @@
Default
- - - +
+ + + +
Severities
- - - - - - - +
+ + + + + + + +
Text
- - - - - - - - +
+ + + + + + + + +
Outlined
- - - - - - - +
+ + + + + + + +
@@ -46,100 +54,117 @@ -
SplitButton
- - - - - +
+ + + + + +
Templating
- - logo - - - - logo - PrimeNG - +
+ + logo + + + + logo + PrimeNG + +
Icons
- - - +
+ + + +
Raised
- - - - - - - +
+ + + + + + + +
Rounded
- - - - - - - +
+ + + + + + + +
Rounded Icons
- - - - - - - +
+ + + + + + + +
Rounded Text
- - - - - - - - +
+ + + + + + + + +
- +
Rounded Outlined
- - - - - - - +
+ + + + + + + +
Loading
- - - - +
+ + + + +
\ No newline at end of file diff --git a/src/app/demo/components/uikit/charts/charts.component.ts b/src/app/demo/components/uikit/charts/charts.component.ts index cee5014..50a048d 100644 --- a/src/app/demo/components/uikit/charts/charts.component.ts +++ b/src/app/demo/components/uikit/charts/charts.component.ts @@ -50,14 +50,14 @@ export class ChartsComponent implements OnInit, OnDestroy { datasets: [ { label: 'My First dataset', - backgroundColor: documentStyle.getPropertyValue('--bluegray-700'), - borderColor: documentStyle.getPropertyValue('--bluegray-700'), + backgroundColor: documentStyle.getPropertyValue('--primary-500'), + borderColor: documentStyle.getPropertyValue('--primary-700'), data: [65, 59, 80, 81, 56, 55, 40] }, { label: 'My Second dataset', - backgroundColor: documentStyle.getPropertyValue('--green-600'), - borderColor: documentStyle.getPropertyValue('--green-600'), + backgroundColor: documentStyle.getPropertyValue('--bluegray-500'), + borderColor: documentStyle.getPropertyValue('--bluegray-500'), data: [28, 48, 40, 19, 86, 27, 90] } ] @@ -133,16 +133,16 @@ export class ChartsComponent implements OnInit, OnDestroy { label: 'First Dataset', data: [65, 59, 80, 81, 56, 55, 40], fill: false, - backgroundColor: documentStyle.getPropertyValue('--bluegray-700'), - borderColor: documentStyle.getPropertyValue('--bluegray-700'), + backgroundColor: documentStyle.getPropertyValue('--primary-700'), + borderColor: documentStyle.getPropertyValue('--primary-700'), tension: .4 }, { label: 'Second Dataset', data: [28, 48, 40, 19, 86, 27, 90], fill: false, - backgroundColor: documentStyle.getPropertyValue('--green-600'), - borderColor: documentStyle.getPropertyValue('--green-600'), + backgroundColor: documentStyle.getPropertyValue('--bluegray-600'), + borderColor: documentStyle.getPropertyValue('--bluegray-600'), tension: .4 } ] diff --git a/src/app/demo/components/uikit/input/inputdemo.component.html b/src/app/demo/components/uikit/input/inputdemo.component.html index 8f327d8..972ec96 100644 --- a/src/app/demo/components/uikit/input/inputdemo.component.html +++ b/src/app/demo/components/uikit/input/inputdemo.component.html @@ -145,20 +145,11 @@
Multiselect
- - -
- -
{{option.name}}
-
-
- Select Countries -
- + -
- -
{{country.name}}
+
+ + {{country.name}}
@@ -179,7 +170,7 @@
InputGroup
-
+
diff --git a/src/app/demo/components/uikit/input/inputdemo.component.ts b/src/app/demo/components/uikit/input/inputdemo.component.ts index b94cf75..4aa4fb9 100644 --- a/src/app/demo/components/uikit/input/inputdemo.component.ts +++ b/src/app/demo/components/uikit/input/inputdemo.component.ts @@ -4,53 +4,7 @@ import { SelectItem } from 'primeng/api'; import { CountryService } from 'src/app/demo/service/country.service'; @Component({ - templateUrl: './inputdemo.component.html', - styles: [` - :host ::ng-deep .p-multiselect { - min-width: 15rem; - } - - :host ::ng-deep .multiselect-custom-virtual-scroll .p-multiselect { - min-width: 20rem; - } - - :host ::ng-deep .multiselect-custom .p-multiselect-label { - padding-top: .25rem; - padding-bottom: .25rem; - - } - - :host ::ng-deep .multiselect-custom .country-item.country-item-value { - padding: .25rem .5rem; - border-radius: 3px; - display: inline-flex; - margin-right: .5rem; - background-color: var(--primary-color); - color: var(--primary-color-text); - } - - :host ::ng-deep .multiselect-custom .country-item.country-item-value img.flag { - width: 17px; - } - - :host ::ng-deep .multiselect-custom .country-item { - display: flex; - align-items: center; - } - - :host ::ng-deep .multiselect-custom .country-item img.flag { - width: 18px; - margin-right: .5rem; - } - - :host ::ng-deep .multiselect-custom .country-placeholder { - padding: 0.25rem; - } - - :host ::ng-deep .p-colorpicker { - width: 2.5em - } - `] + templateUrl: './inputdemo.component.html' }) export class InputDemoComponent implements OnInit { countries: any[] = []; diff --git a/src/app/demo/components/uikit/list/listdemo.component.html b/src/app/demo/components/uikit/list/listdemo.component.html index 07a036d..6fc03c7 100644 --- a/src/app/demo/components/uikit/list/listdemo.component.html +++ b/src/app/demo/components/uikit/list/listdemo.component.html @@ -20,7 +20,7 @@
{{product.name}}
-
{{product.description}}
+
{{product.description}}
@@ -39,14 +39,14 @@
-
+
{{product.category}}
{{product.inventoryStatus}}
-
+
{{product.name}}
{{product.description}}
diff --git a/src/app/demo/components/uikit/menus/menus.component.ts b/src/app/demo/components/uikit/menus/menus.component.ts index 34c2e35..e23d563 100644 --- a/src/app/demo/components/uikit/menus/menus.component.ts +++ b/src/app/demo/components/uikit/menus/menus.component.ts @@ -3,7 +3,11 @@ import { MegaMenuItem, MenuItem } from 'primeng/api'; @Component({ templateUrl: './menus.component.html', - encapsulation: ViewEncapsulation.None + styles: [` + :host ::ng-deep .p-menubar-root-list { + flex-wrap: wrap; + } + `] }) export class MenusComponent implements OnInit { diff --git a/src/app/demo/components/uikit/messages/messagesdemo.component.html b/src/app/demo/components/uikit/messages/messagesdemo.component.html index 412e309..1e0f861 100644 --- a/src/app/demo/components/uikit/messages/messagesdemo.component.html +++ b/src/app/demo/components/uikit/messages/messagesdemo.component.html @@ -2,21 +2,25 @@
Toast
- - - - - + +
+ + + + +
Messages
- - - - +
+ + + + +
@@ -25,20 +29,16 @@
Inline
-
- -
- - -
+
+ + +
-
- -
- - -
+
+ + +
diff --git a/src/app/demo/components/uikit/messages/messagesdemo.component.ts b/src/app/demo/components/uikit/messages/messagesdemo.component.ts index 791e6b8..f342807 100644 --- a/src/app/demo/components/uikit/messages/messagesdemo.component.ts +++ b/src/app/demo/components/uikit/messages/messagesdemo.component.ts @@ -3,15 +3,6 @@ import { Message, MessageService } from 'primeng/api'; @Component({ templateUrl: './messagesdemo.component.html', - styles: [` - :host ::ng-deep .p-message { - margin-left: .25em; - } - - :host ::ng-deep .p-toast{ - z-index:99999; - } - `], providers: [MessageService] }) export class MessagesDemoComponent { diff --git a/src/app/demo/components/uikit/misc/miscdemo.component.html b/src/app/demo/components/uikit/misc/miscdemo.component.html index e70d40c..b610691 100644 --- a/src/app/demo/components/uikit/misc/miscdemo.component.html +++ b/src/app/demo/components/uikit/misc/miscdemo.component.html @@ -16,29 +16,34 @@

Badge

Numbers
-
- - - - +
+ + + +
Positioned Badge
- - - +
+ + + +
Inline Button Badge
- - +
+ + +
+
Sizes
-
- - - +
+ + +
@@ -55,12 +60,14 @@
Label - Circle
- - - +
+ + + +
Icon - Badge
- +
@@ -87,31 +94,37 @@

Tag

Tags
- - - - - +
+ + + + + +
Pills
- - - - - +
+ + + + + +
Icons
- - - - - +
+ + + + + +

Chip

Basic
-
+
@@ -119,7 +132,7 @@
Icon
-
+
@@ -127,7 +140,7 @@
Image
-
+
@@ -135,7 +148,7 @@
Styling
-
+
diff --git a/src/app/demo/components/uikit/overlays/overlaysdemo.component.html b/src/app/demo/components/uikit/overlays/overlaysdemo.component.html index 2b042d1..cb8fb12 100644 --- a/src/app/demo/components/uikit/overlays/overlaysdemo.component.html +++ b/src/app/demo/components/uikit/overlays/overlaysdemo.component.html @@ -23,14 +23,14 @@
Overlay Panel
-
-
+
+
Nature 1
-
+
@@ -91,22 +91,24 @@

Full Screen Sidebar

- - - - - +
+ + + + + +
Tooltip
-
-
+
+ -
+
diff --git a/src/app/demo/components/uikit/table/tabledemo.component.html b/src/app/demo/components/uikit/table/tabledemo.component.html index a31d8f5..90d2c3c 100644 --- a/src/app/demo/components/uikit/table/tabledemo.component.html +++ b/src/app/demo/components/uikit/table/tabledemo.component.html @@ -119,10 +119,10 @@ {{customer.status}} - + - + @@ -162,8 +162,8 @@ - {{customer.name}} - {{customer.id}} + {{customer.name}} + {{customer.id}} {{customer.country.name}} @@ -178,7 +178,7 @@ {{customer.representative.name}} - {{formatCurrency(customer.balance)}} + {{formatCurrency(customer.balance)}} diff --git a/src/app/demo/components/uikit/table/tabledemo.component.ts b/src/app/demo/components/uikit/table/tabledemo.component.ts index 26aa5e6..9c86118 100644 --- a/src/app/demo/components/uikit/table/tabledemo.component.ts +++ b/src/app/demo/components/uikit/table/tabledemo.component.ts @@ -12,20 +12,7 @@ interface expandedRows { @Component({ templateUrl: './tabledemo.component.html', - providers: [MessageService, ConfirmationService], - styles: [` - :host ::ng-deep .p-frozen-column { - font-weight: bold; - } - - :host ::ng-deep .p-datatable-frozen-tbody { - font-weight: bold; - } - - :host ::ng-deep .p-progressbar { - height:.5rem; - } - `] + providers: [MessageService, ConfirmationService] }) export class TableDemoComponent implements OnInit { diff --git a/src/assets/layout/styles/layout/_utils.scss b/src/assets/layout/styles/layout/_utils.scss index 5143007..3a6fb0d 100644 --- a/src/assets/layout/styles/layout/_utils.scss +++ b/src/assets/layout/styles/layout/_utils.scss @@ -22,6 +22,6 @@ &.p-toast-top-right, &.p-toast-top-left, &.p-toast-top-center { - top: 75px; + top: 100px; } } \ No newline at end of file