Skip to content

Commit

Permalink
Merge pull request #107 from Xyna-Factory/106-styling-fixed-due-mater…
Browse files Browse the repository at this point in the history
…ial-update

106 styling fixed due material update
  • Loading branch information
Sela1236 authored Dec 21, 2023
2 parents 36329db + 2d136dd commit 6b46965
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions xc/xc-form/xc-form-base/xc-form-base.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ $suffix-icon-height: 24px;

&.mat-input-element {
box-sizing: border-box;
caret-color: $xc-form-base-input-color;
}
}

Expand Down
6 changes: 4 additions & 2 deletions xc/xc-spinner/xc-spinner.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
:host {
@each $key, $value in $color-map {
&[color="#{$key}"] .mat-spinner {
stroke: $value;
::ng-deep circle {
stroke: $value;
}
}
}

Expand All @@ -44,4 +46,4 @@
transform: rotate(360deg) scale(0.5);
}
}
}
}
6 changes: 6 additions & 0 deletions xc/xc-table/xc-table.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ $xc-table-body-border-color-focus: unset !default;
width: 100%;
border-collapse: collapse;
position: relative;
background-color: $xc-table-background-color;
}

::ng-deep tbody:focus {
Expand Down Expand Up @@ -166,6 +167,7 @@ $xc-table-body-border-color-focus: unset !default;
.mat-cell {
font-size: $font-size-medium;
overflow: hidden;
color: $xc-table-entry-color;

&:first-child {
border-left: none;
Expand Down Expand Up @@ -200,6 +202,10 @@ $xc-table-body-border-color-focus: unset !default;
&::ng-deep {

.mat-sort-header {
.mat-sort-header-arrow {
color: $xc-table-entry-color;
}

> .mat-sort-header-container {
padding: $xc-table-header-padding;
border-bottom: 0;
Expand Down

0 comments on commit 6b46965

Please sign in to comment.