forks/peertube
1
0
Fork 0
Code Releases Activity

Fix subscribe button radius

Browse source
This commit is contained in:
Chocobozzz 2024-12-19 09:46:54 +01:00
parent 6a02798e83
commit c644dd4f99
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/src/app/shared/shared-user-subscription/subscribe-button.component.html
View file

@ -21,7 +21,7 @@
@if (isUserLoggedIn()) {
@if (isAllChannelsSubscribed) {
<button type="button" [ngClass]="buttonClasses" class="btn" (click)="unsubscribe()">
<button type="button" [ngClass]="buttonClasses" class="btn last-in-group" (click)="unsubscribe()">
<ng-container i18n>{account + "", select, undefined {Unsubscribe} other {Unsubscribe from all channels}}</ng-container>
</button>
} @else {

2
client/src/sass/application.scss
View file

@ -57,6 +57,8 @@ body {
--input-y-padding: 5px;
--input-x-padding: 20px;
--input-border-radius: 4px;
--textarea-fg: var(--textareaForegroundColor, #{pvar(--input-fg)});
--textarea-bg: var(--textareaBackgroundColor, #{pvar(--input-bg)});

4
client/src/sass/bootstrap.scss vendored
View file

@ -347,8 +347,8 @@ body {
.input-group,
.btn-group {
.last-in-group {
border-top-right-radius: 3px !important;
border-bottom-right-radius: 3px !important;
border-top-right-radius: pvar(--input-border-radius) !important;
border-bottom-right-radius: pvar(--input-border-radius) !important;
}
}

6
client/src/sass/include/_button-mixins.scss
View file

@ -145,7 +145,7 @@
padding: pvar(--input-y-padding) pvar(--input-x-padding);
font-weight: $font-semibold;
border-radius: 4px;
border-radius: pvar(--input-border-radius);
text-align: center;
cursor: pointer;
@ -163,7 +163,7 @@
&:is(input[type=button]) {
// Because of primeng that redefines border-radius of all input[type="..."]
border-radius: 4px !important;
border-radius: pvar(--input-border-radius) !important;
}
}
@ -176,7 +176,7 @@
font-weight: $font-semibold;
// Because of primeng that redefines border-radius of all input[type="..."]
border-radius: 4px !important;
border-radius: pvar(--input-border-radius) !important;
}
@mixin peertube-button-small {

4
client/src/sass/include/_form-mixins.scss
View file

@ -13,7 +13,7 @@
color: pvar(--input-fg);
background-color: pvar(--input-bg);
border: 1px solid pvar(--input-border-color);
border-radius: 4px;
border-radius: pvar(--input-border-radius);
@include rounded-line-height-1-5($font-size);
@ -93,7 +93,7 @@
color: pvar(--input-fg);
background: pvar(--input-bg);
border-radius: 4px;
border-radius: pvar(--input-border-radius);
}
&:focus,

1
client/src/sass/include/_variables.scss
View file

@ -101,6 +101,7 @@ $variables: (
--input-placeholder: var(--input-placeholder),
--input-border-color: var(--input-border-color),
--input-bg-in-secondary: var(--input-bg-in-secondary),
--input-border-radius: var(--input-border-radius),
--input-check-active-fg: var(--input-check-active-fg),
--input-check-active-bg: var(--input-check-active-bg),

10
client/src/sass/primeng-custom.scss
View file

@ -151,7 +151,7 @@ body .p-dropdown {
background: pvar(--input-bg);
border: 1px solid pvar(--input-border-color);
transition: border-color 0.2s, box-shadow 0.2s;
border-radius: 4px;
border-radius: pvar(--input-border-radius);
}
body .p-dropdown:not(.p-disabled):hover {
border-color: pvar(--input-border-color);
@ -527,7 +527,7 @@ p-chips.p-chips-clearable .p-chips-clear-icon {
background: pvar(--input-bg);
border: 1px solid pvar(--input-border-color);
transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
border-radius: 4px;
border-radius: pvar(--input-border-radius);
font-size: 16px;
}
.p-multiselect:not(.p-disabled):hover {
@ -552,7 +552,7 @@ p-chips.p-chips-clearable .p-chips-clear-icon {
margin-right: 0.25rem;
background: pvar(--bg-secondary-500);
color: pvar(--fg);
border-radius: 4px;
border-radius: pvar(--input-border-radius);
}
.p-multiselect.p-multiselect-chip .p-multiselect-token .p-multiselect-token-icon {
margin-left: 0.5rem;
@ -589,7 +589,7 @@ p-chips.p-chips-clearable .p-chips-clear-icon {
background: pvar(--bg);
color: pvar(--fg);
border: 1px solid pvar(--input-border-color);
border-radius: 4px;
border-radius: pvar(--input-border-radius);
box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.16);
}
.p-multiselect-panel .p-multiselect-header {
@ -702,7 +702,7 @@ p-multiselect.ng-dirty.ng-invalid > .p-multiselect {
border: 1px solid pvar(--input-border-color);
transition: background-color 0.2s, color 0.2s, border-color 0.2s, box-shadow 0.2s;
appearance: none;
border-radius: 4px;
border-radius: pvar(--input-border-radius);
}
.p-inputtext:enabled:hover {
border-color: pvar(--input-border-color);