Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

Fixed button styles

Browse Source
This commit is contained in:
Adina Țeudan 2021-02-24 15:39:09 +02:00
parent 782702e96e
commit d704f5362b
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.html
View File

@ -5,6 +5,7 @@
(click)="action.emit($event)"
[class.show-bg]="type === 'show-bg'"
[disabled]="disabled"
[class.has-icon]="!!icon"
type="button"
>
<mat-icon [svgIcon]="icon" *ngIf="icon"></mat-icon>

6
apps/red-ui/src/app/components/buttons/icon-button/icon-button.component.scss
View File

@ -1,7 +1,11 @@
@import '../../../../assets/styles/red-variables';
button {
padding: 0 14px 0 10px;
padding: 0 14px;
&.has-icon {
padding: 0 14px 0 10px;
}
&.show-bg {
background-color: $grey-6;

2
apps/red-ui/src/app/dialogs/overwrite-files-dialog/overwrite-files-dialog.component.html
View File

@ -11,7 +11,7 @@
<div class="dialog-actions">
<button (click)="selectOption('overwrite')" color="primary" mat-flat-button translate="overwrite-files-dialog.options.overwrite"></button>
<button (click)="selectOption('skip')" mat-flat-button translate="overwrite-files-dialog.options.skip"></button>
<redaction-icon-button text="overwrite-files-dialog.options.skip" (action)="selectOption('skip')" type="show-bg"></redaction-icon-button>
<div class="all-caps-label cancel" (click)="cancel()" translate="overwrite-files-dialog.options.cancel"></div>
</div>
</section>

13
apps/red-ui/src/assets/styles/red-button.scss
View File

@ -31,20 +31,11 @@
opacity: 0 !important;
}
.mat-flat-button,
.mat-button {
.mat-flat-button.mat-primary,
.mat-button.primary {
padding: 0 14px;
transition: background-color 0.2s, color 0.2s;
background-color: $grey-6;
&:not(.mat-button-disabled):hover {
background-color: $grey-4;
}
}
.mat-flat-button.mat-primary,
.mat-button.primary {
background-color: $red-1;
&.mat-button-disabled {