Skip to content

Commit

Permalink
feat(angular-material): fix linting:scss
Browse files Browse the repository at this point in the history
upgrade angular-material to 16

BREAKING CHANGE: ⛵upgrade angular-material to 16
  • Loading branch information
romdhanisam committed Oct 17, 2023
1 parent ff9a83c commit 29bd6a7
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 8 deletions.
11 changes: 9 additions & 2 deletions modules/web/src/_theming.scss
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
$box-shadow-3: rgb(0 0 0 / 0.12);
$box-shadow: 0 3px 1px -2px $box-shadow-1, 0 2px 2px 0 $box-shadow-2, 0 1px 5px 0 $box-shadow-3;
$white: #fff;

// Global style overrides.

@include mat.form-field-density(-4);
Expand All @@ -42,10 +43,12 @@
mat-form-field {
width: 100%;
}

.mdc-notched-outline {
.mdc-notched-outline__leading {
display: none !important;
}

.mdc-notched-outline__trailing {
border: 1px solid $border !important;
border-radius: 2px !important;
Expand Down Expand Up @@ -212,9 +215,11 @@
.mdc-text-field__input {
font-size: $subhead-font-size-base;
}

.mdc-text-field {
background-color: color.adjust($background, $lightness: -2.5%);
}

.mdc-notched-outline__trailing {
display: none;
}
Expand Down Expand Up @@ -242,11 +247,12 @@
}
}

/*MAT chips Theming*/
/* MAT chips Theming */

.mat-mdc-chip.mat-mdc-standard-chip {
background: $card-background-dark;
}

.kd-chips-show-button {
color: map.get($colors, primary);

Expand All @@ -255,7 +261,7 @@
}
}

/*MAT chips Theming End*/
/* MAT chips Theming End */

button.mat-mdc-icon-button {
color: theming.mat-color($foreground-palette, text);
Expand Down Expand Up @@ -313,6 +319,7 @@
.kd-secret-detail-text {
mat-form-field {
width: 100%;

.mdc-text-field {
background-color: $border;
}
Expand Down
1 change: 1 addition & 0 deletions modules/web/src/create/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

.kd-create-container {
padding: 0;

::ng-deep .mat-mdc-tab-body-content{
height: auto;
padding: 2.5 * $baseline-grid;
Expand Down
15 changes: 9 additions & 6 deletions modules/web/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ router-outlet::after {
z-index: 1;
}

/*MDC MAT chips*/
/* MDC MAT chips */
.mat-mdc-chip.mat-mdc-standard-chip {
box-shadow: none !important;
font-size: $body-font-size-base;
Expand All @@ -292,14 +292,14 @@ router-outlet::after {
line-height: $body-font-size-base;
min-height: unset;
padding: ($baseline-grid * 0.75) ($baseline-grid * 1.25);
transition: none !important;
word-break: break-all !important;
padding-left: unset;
padding-right: unset;
transition: none !important;
word-break: break-all !important;

.mdc-evolution-chip__text-label {
white-space: normal;
line-height: normal;
white-space: normal;
}

&:hover::after {
Expand All @@ -314,7 +314,8 @@ router-outlet::after {
.mat-mdc-chip-focus-overlay {
background: none !important;
}
/* MDC MAT chips end*/

/* MDC MAT chips end */

.kd-chips-show-button {
cursor: pointer;
Expand Down Expand Up @@ -394,7 +395,6 @@ kd-logs {
}

.kd-standard-form-field {

mat-form-field {
width: 100%;

Expand All @@ -406,13 +406,16 @@ kd-logs {
.mdc-notched-outline__leading {
display: none;
}

.mdc-notched-outline__notch {
border-radius: 0;
border-top: none;

.mdc-floating-label {
left: 0;
}
}

.mdc-notched-outline__trailing {
border-radius: 0;
border-right: none;
Expand Down
2 changes: 2 additions & 0 deletions modules/web/src/resource/config/secret/detail/edit/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $kd-code-block-typography: mat.define-typography-config(

.kd-code-block {
@include mat.typography-level($kd-code-block-typography, 'body-1');

border-radius: $baseline-grid * 0.25;
display: block;
padding: $baseline-grid * 2;
Expand All @@ -35,6 +36,7 @@ $kd-code-block-typography: mat.define-typography-config(

.kd-secret-detail-text {
width: 100%;

.mat-mdc-input-element {
@include mat.typography-level($kd-code-block-typography, 'body-1');
}
Expand Down
1 change: 1 addition & 0 deletions modules/web/src/settings/global/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ kd-settings-entry:nth-child(n)~ kd-settings-entry {

mat-slider {
margin-left: 24px;

--mdc-slider-handle-height: 16px;
--mdc-slider-handle-width: 16px;
--mdc-slider-active-track-height: 2px;
Expand Down
1 change: 1 addition & 0 deletions modules/web/src/shell/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ $shell-background-color: #000;
> .mat-mdc-card-title + div {
@include flex-full-height;
}

.mat-mdc-card-content {
@include flex-full-height;

Expand Down

0 comments on commit 29bd6a7

Please sign in to comment.