aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2023-03-16 14:24:50 +0100
committerChocobozzz <me@florianbigard.com>2023-03-16 14:24:50 +0100
commit47d883de2efbc2e8b5f6f94ae18c15224cbe982b (patch)
tree7e89efd42cd7f70656ef9443d0f1e0ae1fc1a659 /client/src/app/shared
parent016b887802aebdb1bada121aa2102f0e0f6e0997 (diff)
parentc3441b0320f632e22318261bcd614d10187de22d (diff)
downloadPeerTube-47d883de2efbc2e8b5f6f94ae18c15224cbe982b.tar.gz
PeerTube-47d883de2efbc2e8b5f6f94ae18c15224cbe982b.tar.zst
PeerTube-47d883de2efbc2e8b5f6f94ae18c15224cbe982b.zip
Merge branch 'release/5.1.0' into develop
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/shared-main/buttons/action-dropdown.component.html2
-rw-r--r--client/src/app/shared/shared-main/buttons/action-dropdown.component.scss3
2 files changed, 2 insertions, 3 deletions
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
index 17acb3eab..bbfab7b37 100644
--- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
+++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.html
@@ -1,7 +1,7 @@
1<div class="dropdown-root" ngbDropdown [placement]="placement" [container]="container" *ngIf="areActionsDisplayed(actions, entry)"> 1<div class="dropdown-root" ngbDropdown [placement]="placement" [container]="container" *ngIf="areActionsDisplayed(actions, entry)">
2 <button 2 <button
3 class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange', 'button-styled': buttonStyled }" 3 class="action-button" [ngClass]="{ small: buttonSize === 'small', grey: theme === 'grey', orange: theme === 'orange', 'button-styled': buttonStyled }"
4 ngbDropdownToggle role="button" aria-label="Open actions" i18n-aria-label 4 ngbDropdownToggle aria-label="Open actions" i18n-aria-label
5 > 5 >
6 <my-global-icon *ngIf="!label && buttonDirection === 'horizontal'" class="more-icon" iconName="more-horizontal"></my-global-icon> 6 <my-global-icon *ngIf="!label && buttonDirection === 'horizontal'" class="more-icon" iconName="more-horizontal"></my-global-icon>
7 <my-global-icon *ngIf="!label && buttonDirection === 'vertical'" class="more-icon" iconName="more-vertical"></my-global-icon> 7 <my-global-icon *ngIf="!label && buttonDirection === 'vertical'" class="more-icon" iconName="more-vertical"></my-global-icon>
diff --git a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
index 5d400c0f7..8e5bb266f 100644
--- a/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
+++ b/client/src/app/shared/shared-main/buttons/action-dropdown.component.scss
@@ -41,8 +41,7 @@
41 41
42 &.small { 42 &.small {
43 font-size: 14px; 43 font-size: 14px;
44 height: 20px; 44 padding: 0 10px;
45 line-height: 20px;
46 } 45 }
47} 46}
48 47