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

fix(components/tiles): remove ::ng-deep from tile styles #2527

Merged
merged 2 commits into from
Jul 22, 2024
Merged

fix(components/tiles): remove ::ng-deep from tile styles #2527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cf9188
fix(components/tiles): remove `::ng-deep` from tile styles
Blackbaud-PaulCrowder Jul 20, 2024
6b4038c
Merge branch '10.x.x' into tiles-ng-deep-fix
Blackbaud-PaulCrowder Jul 22, 2024
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
24 changes: 24 additions & 0 deletions libs/components/tiles/src/lib/modules/tiles/tile-content/tile-content-section.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,32 @@
@use 'libs/components/theme/src/lib/styles/mixins' as mixins;
@use 'libs/components/theme/src/lib/styles/variables' as *;

:host:not(:last-child) .sky-tile-content-section {
@include mixins.sky-border(light);
}

:host-context(.sky-theme-modern sky-tile-content) {
.sky-tile-content-section {
border-bottom: 1px dotted $sky-theme-modern-color-gray-30;
}

:host:first-child {
.sky-tile-content-section {
margin-top: $sky-space-lg;
}
}

:host:last-child {
.sky-tile-content-section {
padding-bottom: 0;
border-bottom: none;
}
}
}

@include mixins.sky-theme-modern {
.sky-tile-content-section {
border-bottom: 1px dotted $sky-theme-modern-color-gray-30;
padding: $sky-space-lg 0;
}
}
8 changes: 0 additions & 8 deletions libs/components/tiles/src/lib/modules/tiles/tile-content/tile-content.component.scss
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion libs/components/tiles/src/lib/modules/tiles/tile-content/tile-content.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { Component } from '@angular/core';
@Component({
standalone: true,
selector: 'sky-tile-content',
styleUrls: ['./tile-content.component.scss'],
templateUrl: 'tile-content.component.html',
})
export class SkyTileContentComponent {}
20 changes: 0 additions & 20 deletions libs/components/tiles/src/lib/modules/tiles/tile-dashboard/tile-dashboard.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,9 @@
.sky-tile-dashboard-layout-single {
display: block;
}

/* NOTE: This style is here as we only want it when inside a tile dashboard */
.sky-tile-dashboard-layout-single ::ng-deep .sky-tile,
.sky-tile-dashboard-layout-multi ::ng-deep .sky-tile {
margin-bottom: 0;
}
}

:host-context(.sky-tile-dashboard-gt-xs) {
.sky-tile-dashboard-layout-single ::ng-deep .sky-tile,
.sky-tile-dashboard-layout-multi ::ng-deep .sky-tile {
margin-bottom: $sky-margin-double;
}

:host-context(.sky-theme-default) {
padding-top: $sky-padding-double;
}
Expand Down Expand Up @@ -53,12 +42,3 @@
:host-context(.sky-theme-default) {
background-color: $sky-background-color-neutral-light;
}

@include mixins.sky-theme-modern {
:host-context(.sky-tile-dashboard-gt-xs) {
.sky-tile-dashboard-layout-single ::ng-deep .sky-tile,
.sky-tile-dashboard-layout-multi ::ng-deep .sky-tile {
margin-bottom: $sky-theme-modern-space-xl;
}
}
}
50 changes: 31 additions & 19 deletions libs/components/tiles/src/lib/modules/tiles/tile/tile.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,28 @@
margin-bottom: $sky-margin-double;
}

/* NOTE: This style is here as we only want it when inside a tile dashboard */
:host-context(
.sky-tile-dashboard-layout-single,
.sky-tile-dashboard-layout-multi
)
.sky-tile {
margin-bottom: 0;
}

:host-context(.sky-tile-dashboard-gt-xs) {
:host-context(.sky-tile-dashboard-layout-single),
:host-context(.sky-tile-dashboard-layout-multi) {
.sky-tile {
margin-bottom: $sky-margin-double;
}
}

:host-context(.sky-theme-default) {
padding-top: $sky-padding-double;
}
}

.sky-tile-header {
border-color: $sky-border-color-neutral-medium;
border-style: solid solid none;
Expand Down Expand Up @@ -108,25 +130,6 @@
font-size: 16px;
}

.sky-tile-content {
::ng-deep .sky-tile-content-section {
border-bottom: 1px dotted $sky-theme-modern-color-gray-30;
}

::ng-deep sky-tile-content-section:first-child {
.sky-tile-content-section {
margin-top: $sky-space-lg;
}
}

::ng-deep sky-tile-content-section:last-child {
.sky-tile-content-section {
padding-bottom: 0;
border-bottom: none;
}
}
}

@include mixins.sky-host-responsive-container-xs-min() {
.sky-tile {
border-radius: 0px;
Expand All @@ -139,3 +142,12 @@
}
}
}

:host-context(.sky-theme-modern .sky-tile-dashboard-gt-xs) {
:host-context(.sky-tile-dashboard-layout-single),
:host-context(.sky-tile-dashboard-layout-multi) {
.sky-tile {
margin-bottom: $sky-theme-modern-space-xl;
}
}
}
Loading