Fix sass mixed declarations deprecation warning

https://sass-lang.com/documentation/breaking-changes/mixed-decls/
This commit is contained in:
Chocobozzz 2024-08-16 15:49:08 +02:00
parent 1261bdf1d8
commit c5b66526eb
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
143 changed files with 800 additions and 833 deletions

View File

@ -1,18 +1,55 @@
{
"extends": "stylelint-config-sass-guidelines",
"plugins": [
"stylelint-order"
],
"rules": {
"declaration-empty-line-before": [
"always",
{
"except": [
"first-nested"
],
"ignore": [ "after-declaration", "after-comment" ]
}
],
"at-rule-empty-line-before": [
"always",
{
"except": [
"first-nested",
"blockless-after-blockless"
],
"ignore": [ "after-comment" ],
"ignoreAtRules": [ "else" ]
}
],
"order/order": [
"custom-properties",
"declarations",
{
"type": "at-rule",
"name": "include"
}
],
"scss/selector-no-redundant-nesting-selector": null,
"scss/at-import-no-partial-leading-underscore": null,
"color-hex-length": null,
"selector-pseudo-element-no-unknown": [
true,
{
"ignorePseudoElements": [ "ng-deep" ]
"ignorePseudoElements": [
"ng-deep"
]
}
],
"max-nesting-depth": [
8,
{
"ignore": [ "blockless-at-rules", "pseudo-classes" ]
"ignore": [
"blockless-at-rules",
"pseudo-classes"
]
}
],
"selector-max-compound-selectors": 9,
@ -25,7 +62,10 @@
"property-no-vendor-prefix": [
true,
{
"ignoreProperties": [ "mask-image", "mask-size" ]
"ignoreProperties": [
"mask-image",
"mask-size"
]
}
]
}

View File

@ -115,6 +115,7 @@
"socket.io-client": "^4.5.4",
"stylelint": "^16.2.1",
"stylelint-config-sass-guidelines": "^11.0.0",
"stylelint-order": "^6.0.4",
"tinykeys": "^2.1.0",
"ts-node": "^10.9.2",
"tslib": "^2.4.0",

View File

@ -14,10 +14,10 @@
}
.middle-title {
margin-top: 0;
@include in-content-small-title;
@include margin-bottom(1.5rem);
margin-top: 0;
}
.block {
@ -25,17 +25,17 @@
}
.anchor-link {
@include disable-outline;
position: relative;
@include disable-outline;
&:hover,
&:active {
&::after {
@include margin-left(0.2em);
content: '#';
display: inline-block;
@include margin-left(0.2em);
}
}

View File

@ -12,8 +12,6 @@
input[type=text] {
@include peertube-input-text(340px);
display: block;
}
textarea {

View File

@ -8,9 +8,9 @@
}
.card {
@include margin(2rem);
flex-basis: 300px;
@include margin(2rem);
}
.card-title {

View File

@ -8,9 +8,6 @@
}
.channel {
@include padding(1.75rem);
@include margin(2rem, 0);
max-width: $max-channels-width;
background-color: pvar(--channelBackgroundColor);
@ -18,6 +15,9 @@
grid-template-columns: 1fr auto;
grid-template-rows: auto auto;
column-gap: 15px;
@include padding(1.75rem);
@include margin(2rem, 0);
}
.channel-avatar-row {
@ -29,16 +29,16 @@
grid-template-rows: auto 1fr;
my-actor-avatar {
@include margin-right(15px);
grid-column: 1;
grid-row: 1 / 3;
@include margin-right(15px);
}
a {
@include peertube-word-wrap;
color: pvar(--mainForegroundColor);
@include peertube-word-wrap;
}
h2 {
@ -47,20 +47,20 @@
}
.actor-counters {
@include margin-left(15px);
@include actor-counters;
grid-row: 1;
grid-column: 3;
@include margin-left(15px);
@include actor-counters;
}
.description-html {
@include fade-text(50px, pvar(--channelBackgroundColor));
grid-column: 2 / 4;
grid-row: 2;
max-height: 80px;
@include fade-text(50px, pvar(--channelBackgroundColor));
}
}
@ -77,18 +77,18 @@ my-subscribe-button {
position: relative;
my-video-miniature {
@include margin-right(15px);
min-width: $video-thumbnail-medium-width;
max-width: $video-thumbnail-medium-width;
@include margin-right(15px);
}
}
.videos-overflow-workaround {
@include margin-top(2rem);
overflow-x: hidden;
@include margin-top(2rem);
}
.miniature-show-channel {

View File

@ -13,12 +13,12 @@
}
.links {
@include grid-videos-miniature-margins;
display: flex;
justify-content: space-between;
align-items: center;
@include grid-videos-miniature-margins;
&.on-channel-page {
max-width: $max-channels-width;
}
@ -33,16 +33,16 @@ my-copy-button {
}
.account-info {
grid-template-columns: 1fr min-content;
grid-template-rows: auto auto;
background-color: pvar(--submenuBackgroundColor);
@include grid-videos-miniature-margins(false, 15px);
@include padding-top(3.75rem);
@include padding-bottom(3.75rem);
@include margin-bottom(3rem);
@include font-size(1rem);
grid-template-columns: 1fr min-content;
grid-template-rows: auto auto;
background-color: pvar(--submenuBackgroundColor);
}
.account-avatar-row {
@ -60,10 +60,10 @@ my-copy-button {
}
.show-more {
text-align: center;
@include show-more-description;
@include padding-bottom(3.75rem);
text-align: center;
}
.buttons {
@ -91,9 +91,9 @@ my-copy-button {
@media screen and (max-width: $small-view) {
.description:not(.expanded) {
@include fade-text(30px, pvar(--submenuBackgroundColor));
max-height: 70px;
@include fade-text(30px, pvar(--submenuBackgroundColor));
}
.buttons {

View File

@ -25,8 +25,6 @@ my-markdown-textarea {
input[type=text],
input[type=number] {
@include peertube-input-text($form-base-input-width);
display: block;
}
.number-with-unit {
@ -60,22 +58,22 @@ input[type=checkbox] {
my-select-options,
my-select-custom-value,
my-select-checkbox {
@include responsive-width($form-base-input-width);
display: block;
@include responsive-width($form-base-input-width);
}
input[type=submit] {
display: flex;
@include peertube-button;
@include orange-button;
@include margin-left(auto);
display: flex;
+ .form-error {
@include margin-left(5px);
display: inline;
@include margin-left(5px);
}
}
@ -85,11 +83,11 @@ input[type=submit] {
}
textarea {
@include peertube-textarea(500px, 150px);
max-width: 100%;
display: block;
@include peertube-textarea(500px, 150px);
&.small {
height: 75px;
}
@ -136,8 +134,6 @@ ngb-tabset:not(.previews) ::ng-deep {
justify-content: right;
.callout-link {
@include peertube-button-link;
position: relative;
right: 3.3em;
top: .3em;
@ -145,6 +141,8 @@ ngb-tabset:not(.previews) ::ng-deep {
color: pvar(--mainColor);
background-color: pvar(--mainBackgroundColor);
padding: 0 .3em;
@include peertube-button-link;
}
}

View File

@ -2,9 +2,10 @@
@use '_mixins' as *;
a {
@include disable-default-a-behaviour;
display: inline-block;
@include disable-default-a-behaviour;
&,
&:hover {
color: pvar(--mainForegroundColor);

View File

@ -2,9 +2,10 @@
@use '_mixins' as *;
a {
@include disable-default-a-behaviour;
display: inline-block;
@include disable-default-a-behaviour;
&,
&:hover {
color: pvar(--mainForegroundColor);

View File

@ -2,9 +2,10 @@
@use '_mixins' as *;
a {
@include disable-default-a-behaviour;
display: inline-block;
@include disable-default-a-behaviour;
&,
&:hover {
color: pvar(--mainForegroundColor);

View File

@ -2,8 +2,8 @@
@use '_mixins' as *;
my-feed {
@include margin-left(5px);
display: inline-block;
width: 15px;
@include margin-left(5px);
}

View File

@ -1,5 +1,4 @@
@use 'sass:math';
@use '_variables' as *;
@use '_mixins' as *;
@ -7,13 +6,12 @@ $form-base-input-width: 340px;
input:not([type=submit]) {
@include peertube-input-text($form-base-input-width);
display: block;
}
my-input-text {
@include responsive-width($form-base-input-width);
display: block;
@include responsive-width($form-base-input-width);
}
.peertube-select-container {
@ -21,9 +19,9 @@ my-input-text {
}
my-select-custom-value {
@include responsive-width($form-base-input-width);
display: block;
@include responsive-width($form-base-input-width);
}
.danger-zone {
@ -46,13 +44,13 @@ my-select-custom-value {
margin-bottom: 10px;
> a {
@include disable-default-a-behaviour;
text-decoration: none;
color: inherit;
display: block;
font-size: 18px;
@include disable-default-a-behaviour;
&:active,
&:focus,
&:hover {

View File

@ -7,9 +7,9 @@ input[type=password] {
}
input[type=submit] {
margin-top: 10px;
@include peertube-button;
@include danger-button;
@include disable-outline;
margin-top: 10px;
}

View File

@ -1,8 +1,6 @@
@use 'sass:color';
@use '_variables' as *;
@use '_mixins' as *;
@use 'bootstrap/scss/functions' as *;
tr.banned > td {
@ -31,10 +29,10 @@ my-global-icon {
}
.progress {
@include progressbar($small: true);
width: auto;
max-width: 100%;
@include progressbar($small: true);
}
@media screen and (max-width: $primeng-breakpoint) {

View File

@ -15,11 +15,11 @@ my-embed {
display: flex;
my-global-icon {
@include margin-left(3px);
width: 16px;
position: relative;
top: -2px;
@include margin-left(3px);
}
}

View File

@ -21,9 +21,9 @@
}
.pt-badge {
@include margin-left(15px);
font-size: 13px;
@include margin-left(15px);
}
.alert {

View File

@ -7,8 +7,8 @@ h2 {
input[type=submit],
button {
margin-top: 10px;
@include peertube-button;
@include orange-button;
margin-top: 10px;
}

View File

@ -12,9 +12,9 @@
margin-bottom: 10px;
.plugin-name {
@include margin-right(10px);
font-weight: $font-semibold;
@include margin-right(10px);
}
.plugin-version {
@ -34,9 +34,9 @@
}
.buttons {
@include margin-left(auto);
width: max-content;
@include margin-left(auto);
}
}

View File

@ -23,9 +23,9 @@
}
.log-level {
@include margin-right(5px);
font-weight: $font-semibold;
@include margin-right(5px);
}
.log-by {
@ -100,10 +100,10 @@ my-copy-button {
.peertube-select-container,
ng-select,
my-button {
@include margin-left(0 !important);
width: 100% !important;
margin-bottom: 10px !important;
@include margin-left(0 !important);
}
my-button {

View File

@ -2,23 +2,22 @@
@use '_mixins' as *;
.root {
@include margin-left(auto);
@include margin-right(auto);
@include padding-top(9rem);
@include rfs(45rem, width);
height: 100%;
text-align: center;
display: flex;
justify-content: center;
flex-direction: column-reverse;
@include margin-left(auto);
@include margin-right(auto);
@include padding-top(9rem);
@include rfs(45rem, width);
.box {
@include font-size(1.25rem);
text-align: start;
padding: 0 15px;
@include font-size(1.25rem);
}
img {

View File

@ -2,10 +2,10 @@
@use '_mixins' as *;
label {
@include font-size(18px);
display: block;
margin-bottom: 5px;
@include font-size(18px);
}
input[type=text],
@ -34,14 +34,14 @@ input[type=email] {
}
.login-form-and-externals {
@include margin-left(10px);
@include margin-right(10px);
@include margin-bottom(2.5rem);
display: flex;
flex-wrap: wrap;
justify-content: center;
max-width: 450px;
@include margin-left(10px);
@include margin-right(10px);
@include margin-bottom(2.5rem);
}
.external-login-blocks {
@ -49,8 +49,6 @@ input[type=email] {
text-align: center;
.external-login-block {
@include disable-default-a-behaviour;
cursor: pointer;
border: 1px solid #d1d7e0;
border-radius: 5px;
@ -62,6 +60,8 @@ input[type=email] {
min-height: 35px;
min-width: 100px;
@include disable-default-a-behaviour;
&:hover {
background-color: rgba(209, 215, 224, 0.5);
}
@ -69,12 +69,12 @@ input[type=email] {
}
.instance-information {
max-width: 600px;
@include margin-left(10px);
@include margin-right(10px);
@include margin-bottom(2.5rem);
@include rfs (22rem, min-width);
max-width: 600px;
}
.terms-anchor {
@ -91,13 +91,13 @@ input[type=email] {
.login-form-and-externals,
.instance-information {
@include margin-left(0);
@include margin-right(0);
width: 100%;
max-width: 450px;
min-width: unset;
align-self: center;
@include margin-left(0);
@include margin-right(0);
}
.instance-information {

View File

@ -24,7 +24,3 @@ my-markdown-textarea {
.peertube-select-container {
@include peertube-select-container(340px);
}
.pt-two-cols .content-col {
max-width: 500px;
}

View File

@ -12,8 +12,6 @@ my-input-text {
input[type=email] {
@include peertube-input-text(100%);
display: block;
}
input[type=submit] {

View File

@ -15,8 +15,8 @@ my-input-text + my-input-text {
}
input[type=submit] {
margin-top: 15px;
@include peertube-button;
@include orange-button;
margin-top: 15px;
}

View File

@ -7,20 +7,19 @@ input#username + .muted {
input[type=text] {
@include peertube-input-text(340px);
display: block;
}
input[type=submit] {
margin-top: 15px;
@include peertube-button;
@include orange-button;
margin-top: 15px;
}
textarea {
@include peertube-textarea(100%, 150px);
max-width: 100%;
display: block;
@include peertube-textarea(100%, 150px);
}

View File

@ -2,11 +2,11 @@
@use '_mixins' as *;
.root {
@include sub-menu-h1;
flex-direction: column;
width: 100%;
@include sub-menu-h1;
> my-top-menu-dropdown:nth-child(1) {
flex-grow: 1;
}

View File

@ -25,10 +25,10 @@ my-edit-button {
}
.video-channel {
@include row-blocks;
padding-bottom: 0;
@include row-blocks;
my-actor-avatar {
@include margin-right(10px);
}
@ -39,12 +39,12 @@ my-edit-button {
}
.video-channel-names {
@include disable-default-a-behaviour;
width: fit-content;
display: flex;
align-items: baseline;
color: pvar(--mainForegroundColor);
@include disable-default-a-behaviour;
}
.video-channel-display-name {
@ -53,10 +53,10 @@ my-edit-button {
}
.video-channel-name {
@include margin-left(5px);
font-size: 14px;
color: $grey-actor-name;
@include margin-left(5px);
}
.video-channel-followers {

View File

@ -23,13 +23,13 @@
}
.history-switch {
@include margin-left(auto);
@include margin-right(15px);
grid-column: 3;
display: flex;
align-items: center;
@include margin-left(auto);
@include margin-right(15px);
label {
margin: 0 0 0 5px;
color: var(--greyForegroundColor);
@ -38,11 +38,11 @@
}
.delete-history {
grid-column: 4;
@include peertube-button;
@include grey-button;
@include button-with-icon;
grid-column: 4;
}
}

View File

@ -2,11 +2,11 @@
@use '_mixins' as *;
.root {
@include sub-menu-h1;
flex-direction: column;
width: 100%;
@include sub-menu-h1;
> my-top-menu-dropdown:nth-child(1) {
flex-grow: 1;
}

View File

@ -41,19 +41,7 @@
</td>
<td>
<a [href]="videoChangeOwnership.video.url" class="video-table-video-link" [title]="videoChangeOwnership.video.name" target="_blank" rel="noopener noreferrer">
<div class="video-table-video">
<div class="video-table-video-image">
<img [src]="videoChangeOwnership.video.thumbnailPath" alt="">
</div>
<div class="video-table-video-text">
<div>
{{ videoChangeOwnership.video.name }}
</div>
<div class="muted">by {{ videoChangeOwnership.video.channel?.displayName }} </div>
</div>
</div>
</a>
<my-video-cell [video]="videoChangeOwnership.video"></my-video-cell>
</td>
<td>{{ videoChangeOwnership.createdAt | date: 'short' }}</td>

View File

@ -1,58 +0,0 @@
@use 'sass:math';
@use '_miniature' as *;
@use '_mixins' as *;
.video-table-video {
display: inline-flex;
.video-table-video-image {
$image-height: 45px;
@include miniature-thumbnail;
@include margin-right(0.5rem);
height: $image-height;
width: #{math.div(16, 9) * $image-height};
border-radius: 2px;
border: 0;
background: transparent;
display: inline-flex;
justify-content: center;
align-items: center;
position: relative;
img {
height: 100%;
width: 100%;
border-radius: 2px;
}
span {
color: pvar(--inputPlaceholderColor);
}
.video-table-video-image-label {
@include static-thumbnail-overlay;
position: absolute;
border-radius: 3px;
font-size: 10px;
padding: 0 3px;
line-height: 1.3;
bottom: 2px;
right: 2px;
}
}
.video-table-video-text {
display: inline-flex;
flex-direction: column;
justify-content: center;
font-size: 90%;
color: pvar(--mainForegroundColor);
line-height: 1rem;
div + div {
font-size: 80%;
}
}
}

View File

@ -1,21 +1,21 @@
import { SortMeta, SharedModule } from 'primeng/api'
import { DatePipe, NgClass, NgIf } from '@angular/common'
import { Component, OnInit, ViewChild } from '@angular/core'
import { Notifier, RestPagination, RestTable } from '@app/core'
import { VideoChangeOwnership, VideoChangeOwnershipStatus, VideoChangeOwnershipStatusType } from '@peertube/peertube-models'
import { MyAcceptOwnershipComponent } from './my-accept-ownership/my-accept-ownership.component'
import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
import { NgIf, NgClass, DatePipe } from '@angular/common'
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
import { TableModule } from 'primeng/table'
import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
import { VideoOwnershipService } from '@app/shared/shared-main/video/video-ownership.service'
import { Account } from '@app/shared/shared-main/account/account.model'
import { VideoOwnershipService } from '@app/shared/shared-main/video/video-ownership.service'
import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap'
import { VideoChangeOwnership, VideoChangeOwnershipStatus, VideoChangeOwnershipStatusType } from '@peertube/peertube-models'
import { SharedModule, SortMeta } from 'primeng/api'
import { TableModule } from 'primeng/table'
import { ActorAvatarComponent } from '../../shared/shared-actor-image/actor-avatar.component'
import { GlobalIconComponent } from '../../shared/shared-icons/global-icon.component'
import { AutoColspanDirective } from '../../shared/shared-main/angular/auto-colspan.directive'
import { ButtonComponent } from '../../shared/shared-main/buttons/button.component'
import { VideoCellComponent } from '../../shared/shared-tables/video-cell.component'
import { MyAcceptOwnershipComponent } from './my-accept-ownership/my-accept-ownership.component'
@Component({
templateUrl: './my-ownership.component.html',
styleUrls: [ './my-ownership.component.scss' ],
standalone: true,
imports: [
GlobalIconComponent,
@ -28,7 +28,8 @@ import { Account } from '@app/shared/shared-main/account/account.model'
NgClass,
AutoColspanDirective,
MyAcceptOwnershipComponent,
DatePipe
DatePipe,
VideoCellComponent
]
})
export class MyOwnershipComponent extends RestTable implements OnInit {

View File

@ -3,9 +3,9 @@
@use '_actor' as *;
.actor {
@include actor-row($min-height: auto, $separator: true);
margin-bottom: 0;
padding-bottom: 0;
border: 0;
@include actor-row($min-height: auto, $separator: true);
}

View File

@ -3,8 +3,6 @@
input[type=text] {
@include peertube-input-text(340px);
display: block;
}
.peertube-select-container {

View File

@ -8,8 +8,6 @@
}
.playlist-info {
@include margin-left(calc(#{pvar(--horizontalMarginContent)} * -1));
grid-column: 1;
background-color: pvar(--submenuBackgroundColor);
margin-top: -$sub-menu-margin-bottom;
@ -19,6 +17,8 @@
display: flex;
flex-direction: column;
@include margin-left(calc(#{pvar(--horizontalMarginContent)} * -1));
/* fix ellipsis dots background color */
::ng-deep .miniature-name::after {
background-color: pvar(--submenuBackgroundColor) !important;
@ -34,7 +34,6 @@
@include button-with-icon(17px, 3px, -1px);
@include grey-button;
@include apply-svg-color(pvar(--actionButtonColor));
@include margin-right(10px);
}
}

View File

@ -14,10 +14,10 @@ input[type=text] {
}
.video-playlist-buttons {
@include margin-left(10px);
display: flex;
align-self: flex-end;
@include margin-left(10px);
}
.video-playlists-header {
@ -43,9 +43,9 @@ my-delete-button {
}
.video-playlist-buttons {
@include margin-left(auto);
margin-top: 10px;
@include margin-left(auto);
}
}

View File

@ -26,22 +26,22 @@ h1 {
}
.action-button-delete-selection {
display: inline-block;
@include peertube-button;
@include orange-button;
@include button-with-icon(21px);
display: inline-block;
my-global-icon {
@include apply-svg-color(#fff);
}
}
.action-button {
@include margin-left(10px);
display: flex;
align-self: flex-end;
@include margin-left(10px);
}
my-edit-button {
@ -59,9 +59,9 @@ my-edit-button {
}
.action-button {
@include margin-left(auto);
margin-top: 10px;
@include margin-left(auto);
}
}

View File

@ -10,20 +10,19 @@ form {
}
.peertube-radio-container {
@include margin-right(30px);
display: inline-block;
@include margin-right(30px);
}
.peertube-select-container {
@include peertube-select-container(auto);
margin-bottom: 1rem;
@include peertube-select-container(auto);
}
input[type=text] {
@include peertube-input-text(100%);
display: block;
}
input[type=submit] {

View File

@ -43,12 +43,12 @@
cursor: pointer;
.icon.icon-filter {
@include icon(20px);
@include margin-right(5px);
position: relative;
top: -1px;
background-image: url('../../assets/images/feather/filter.svg');
@include icon(20px);
@include margin-right(5px);
}
}
}
@ -72,13 +72,13 @@
}
.video-channel-names {
@include disable-default-a-behaviour;
display: flex;
align-items: baseline;
color: pvar(--mainForegroundColor);
width: fit-content;
flex-wrap: wrap;
@include disable-default-a-behaviour;
}
.video-channel-display-name {
@ -99,10 +99,10 @@
grid-template-rows: auto auto;
my-actor-avatar {
@include build-channel-img-size($video-thumbnail-medium-width);
grid-column: 1;
grid-row: 1 / -1;
@include build-channel-img-size($video-thumbnail-medium-width);
}
}

View File

@ -51,11 +51,11 @@ header {
overflow: hidden;
my-global-icon {
@include apply-svg-color(pvar(--mainColor));
display: flex;
width: 12px;
height: 12px;
@include apply-svg-color(pvar(--mainColor));
}
}
}

View File

@ -26,9 +26,9 @@ my-instance-about-accordion {
align-items: center;
.skip-step {
@include margin-right(30px);
display: inline-block;
@include margin-right(30px);
}
.skip-step-description {

View File

@ -3,7 +3,6 @@
input:not([type=submit]) {
@include peertube-input-text(100%);
display: block;
&#username,
&#name {

View File

@ -3,6 +3,4 @@
input[type=email] {
@include peertube-input-text(340px);
display: block;
}

View File

@ -33,8 +33,6 @@
}
.stats-card {
@include margin-right(15px);
display: flex;
justify-content: center;
align-items: center;
@ -44,6 +42,8 @@
background-color: pvar(--submenuBackgroundColor);
margin-bottom: 15px;
@include margin-right(15px);
.label,
.more-info {
font-size: 14px;

View File

@ -8,8 +8,9 @@
justify-content: center;
.playlist-wrapper {
@include margin-right(15px);
padding-bottom: 15px;
@include margin-right(15px);
}
}
@ -24,9 +25,9 @@
}
.playlists {
justify-content: left;
@include margin-left(pvar(--horizontalMarginContent) !important);
@include margin-right(pvar(--horizontalMarginContent) !important);
justify-content: left;
}
}

View File

@ -30,10 +30,6 @@
}
.channel-info {
// Use the same margin as the videos grid
@include grid-videos-miniature-margins(false, 15px);
@include margin-bottom(3rem);
display: grid;
grid-template-columns: 1fr auto;
grid-template-rows: auto auto;
@ -41,6 +37,10 @@
background-color: pvar(--channelBackgroundColor);
padding-top: var(--myGlobalTopPadding);
font-size: var(--myFontSize);
// Use the same margin as the videos grid
@include grid-videos-miniature-margins(false, 15px);
@include margin-bottom(3rem);
}
.channel-avatar-row {
@ -58,9 +58,9 @@
}
.show-more {
@include show-more-description;
display: none;
@include show-more-description;
}
.channel-buttons {
@ -75,20 +75,20 @@
// Only used on small screen
&.bottom {
@include margin-bottom(2rem);
justify-content: center;
display: none;
@include margin-bottom(2rem);
}
}
.owner-card {
@include margin-left(105px);
grid-column: 2;
// Takes all the column
grid-row: 1 / 3;
place-self: end;
@include margin-left(105px);
}
// Only used on mobile
@ -126,18 +126,18 @@
}
.owner-description {
@include fade-text(120px, pvar(--mainBackgroundColor));
max-height: 140px;
word-break: break-word;
@include fade-text(120px, pvar(--mainBackgroundColor));
}
}
.view-account.short {
margin-top: 30px;
@include peertube-button-link;
@include orange-button-inverted;
margin-top: 30px;
}
.view-account.complete {
@ -155,9 +155,9 @@ my-copy-button {
}
.owner-card {
@include margin-left(60px);
grid-row: 2;
@include margin-left(60px);
}
}
@ -174,9 +174,9 @@ my-copy-button {
}
.channel-description:not(.expanded) {
@include fade-text(30px, pvar(--channelBackgroundColor));
max-height: 70px;
@include fade-text(30px, pvar(--channelBackgroundColor));
}
.show-more {
@ -211,16 +211,16 @@ my-copy-button {
padding: 0;
.avatar-row {
@include margin-right(30px);
grid-column: 1;
@include margin-right(30px);
}
.owner-description {
@include fade-text(30px, pvar(--mainBackgroundColor));
grid-column: 2;
max-height: 70px;
@include fade-text(30px, pvar(--mainBackgroundColor));
}
.view-account {

View File

@ -5,10 +5,10 @@
display: flex;
.information {
@include margin-left(50px);
width: 100%;
@include margin-left(50px);
> div {
margin-bottom: 30px;
}
@ -36,15 +36,14 @@ h2 {
.section {
$min-width: 600px;
@include padding-left(10px);
min-width: $min-width;
margin-bottom: 50px;
border: 1px solid $separator-border-color;
border-radius: 5px;
width: fit-content;
@include padding-left(10px);
.form-group,
.description {
@include margin-left(5px);

View File

@ -19,8 +19,9 @@ my-peertube-checkbox {
min-height: 300px;
input {
@include peertube-input-text(100%);
display: block;
@include peertube-input-text(100%);
}
}
@ -30,27 +31,27 @@ my-peertube-checkbox {
align-items: center;
a.caption-entry-label {
@include disable-default-a-behaviour;
color: #000;
@include disable-default-a-behaviour;
&:hover {
opacity: 0.8;
}
}
.caption-entry-label {
@include margin-right(20px);
font-weight: bold;
min-width: 100px;
@include margin-right(20px);
}
.caption-entry-state {
@include margin-right(15px);
min-width: 250px;
@include margin-right(15px);
&.caption-entry-state-create {
color: #39CC0B;
}
@ -78,10 +79,10 @@ my-peertube-checkbox {
text-align: end;
.message-submit {
@include margin-right(25px);
display: inline-block;
color: pvar(--greyForegroundColor);
@include margin-right(25px);
}
}
@ -94,8 +95,9 @@ p-calendar {
}
.p-inputtext {
@include peertube-input-text(100%);
color: #000;
@include peertube-input-text(100%);
}
}
}

View File

@ -17,10 +17,10 @@ $width-size: 275px;
align-items: center;
.upload-icon {
@include apply-svg-color(pvar(--inputBorderColor));
width: 90px;
margin-bottom: 25px;
@include apply-svg-color(pvar(--inputBorderColor));
}
.peertube-select-container {
@ -42,16 +42,17 @@ $width-size: 275px;
}
input[type=text] {
@include peertube-input-text($width-size);
display: block;
@include peertube-input-text($width-size);
}
input[type=button] {
@include peertube-button;
@include orange-button;
width: $width-size;
margin-top: 30px;
@include peertube-button;
@include orange-button;
}
.button-file {

View File

@ -19,11 +19,11 @@ $nav-link-height: 40px;
.about-link,
.contact-link {
@include peertube-button-link;
@include orange-button;
height: fit-content;
margin-top: 10px;
@include peertube-button-link;
@include orange-button;
}
}

View File

@ -16,9 +16,6 @@
}
::ng-deep.action-button {
@include peertube-button;
@include button-with-icon(21px, 0, -1px);
font-size: 100%;
font-weight: $font-semibold;
display: inline-block;
@ -28,6 +25,9 @@
color: pvar(--actionButtonColor);
text-transform: uppercase;
@include peertube-button;
@include button-with-icon(21px, 0, -1px);
&::after {
display: none;
}

View File

@ -23,12 +23,12 @@ form {
}
textarea {
min-height: calc(#{$peertube-textarea-height} - 15px * 2);
@include peertube-textarea(100%, $peertube-textarea-height);
@include button-focus(pvar(--mainColorLightest));
@include padding-right($markdown-icon-width + 15px !important);
min-height: calc(#{$peertube-textarea-height} - 15px * 2);
@media screen and (max-width: 600px) {
@include padding-right($markdown-icon-width + 19px !important);
}
@ -91,10 +91,10 @@ form {
flex: 1;
code {
@include margin-left(5px);
display: inline-block;
vertical-align: middle;
@include margin-left(5px);
}
}
}

View File

@ -5,12 +5,12 @@
display: flex;
.left {
@include margin-right(10px);
display: flex;
flex-direction: column;
align-items: center;
@include margin-right(10px);
.vertical-border {
width: 2px;
height: 100%;
@ -47,9 +47,6 @@
}
.video-author {
@include padding-right(6px);
@include padding-left(6px);
height: 20px;
background-color: #888888;
border-radius: 12px;
@ -60,6 +57,9 @@
align-items: center;
display: inline-flex;
color: #fff !important;
@include padding-right(6px);
@include padding-left(6px);
}
.comment-account {
@ -68,10 +68,10 @@
font-size: 90%;
a {
@include disable-default-a-behaviour;
color: pvar(--mainForegroundColor);
@include disable-default-a-behaviour;
&:hover {
text-decoration: underline;
}
@ -83,12 +83,12 @@
}
.comment-date {
@include margin-left(5px);
font-size: 90%;
color: pvar(--greyForegroundColor);
text-decoration: none;
@include margin-left(5px);
&:hover {
text-decoration: underline;
}
@ -101,11 +101,11 @@
::ng-deep a {
&:not(.linkified-url) {
@include disable-default-a-behaviour;
color: pvar(--mainForegroundColor);
font-weight: $font-semibold;
@include disable-default-a-behaviour;
}
}
@ -127,11 +127,11 @@
::ng-deep .dropdown-toggle,
.comment-action-reply {
@include margin-right(10px);
color: pvar(--greyForegroundColor);
cursor: pointer;
@include margin-right(10px);
&:hover,
&:active,
&:focus,

View File

@ -21,13 +21,13 @@
}
my-feed {
@include margin-left(5px);
display: inline-block;
transition: ease-in .2s opacity;
width: 12px;
position: relative;
top: -3px;
@include margin-left(5px);
}
}

View File

@ -44,11 +44,11 @@
}
a {
@include disable-default-a-behaviour;
color: pvar(--mainColor);
transition: color 0.3s;
@include disable-default-a-behaviour;
&:hover {
color: pvar(--mainBackgroundColor);
}

View File

@ -8,18 +8,19 @@
}
.attribute-label {
@include padding-right(5px);
min-width: 142px;
display: inline-block;
color: pvar(--greyForegroundColor);
font-weight: $font-bold;
@include padding-right(5px);
}
a.attribute-value {
@include disable-default-a-behaviour;
color: pvar(--mainForegroundColor);
@include disable-default-a-behaviour;
&:hover {
opacity: 0.9;
}

View File

@ -1,11 +1,11 @@
@use '_mixins' as *;
.wrapper {
@include margin-right(5px);
position: relative;
margin-bottom: 5px;
@include margin-right(5px);
.second-avatar {
height: 60%;
width: 60%;

View File

@ -2,12 +2,12 @@
@use '_mixins' as *;
.video-info-description {
@include margin-left($video-watch-info-margin-left);
@include margin-right(0);
margin-top: 20px;
margin-bottom: 20px;
@include margin-left($video-watch-info-margin-left);
@include margin-right(0);
.video-info-description-html {
@include peertube-word-wrap;
@ -27,12 +27,12 @@
}
.video-info-description-more {
@include font-size(14px);
cursor: pointer;
font-weight: $font-semibold;
color: pvar(--greyForegroundColor);
margin-top: 1rem;
@include font-size(14px);
}
}

View File

@ -9,27 +9,27 @@
flex-wrap: wrap-reverse;
.title-page {
@include margin-right(.5rem !important);
margin-bottom: unset;
margin-top: 0;
@include margin-right(.5rem !important);
}
}
.title-page-autoplay {
@include margin-left(auto);
display: flex;
width: max-content;
height: max-content;
align-items: center;
span {
@include margin-right(0.3rem);
@include margin-left(auto);
span {
text-transform: uppercase;
font-size: 85%;
font-weight: 600;
@include margin-right(0.3rem);
}
}

View File

@ -131,14 +131,13 @@ $video-max-height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
}
.video-info-name {
@include peertube-word-wrap;
@include margin-right(30px);
min-height: 40px; // Align with the action buttons
font-size: 27px;
font-weight: $font-semibold;
flex-grow: 1;
@include peertube-word-wrap;
@include margin-right(30px);
}
.video-info-first-row-bottom {
@ -149,22 +148,22 @@ $video-max-height: calc(100vh - #{$header-height} - #{$theater-bottom-space});
}
.video-info-date-views {
@include margin-right(10px);
margin-bottom: 10px;
align-self: start;
font-size: 14px;
@include margin-right(10px);
}
.video-info-channel {
font-weight: $font-semibold;
a {
color: pvar(--mainForegroundColor);
@include disable-default-a-behaviour;
@include peertube-word-wrap;
color: pvar(--mainForegroundColor);
&:hover {
opacity: 0.8;
}
@ -196,29 +195,29 @@ my-subscribe-button {
}
my-video-attributes {
@include margin-left($video-watch-info-margin-left);
display: block;
margin-bottom: 15px;
@include margin-left($video-watch-info-margin-left);
}
my-action-buttons {
@include margin-left(auto);
@include margin-right(0);
display: block;
margin-top: 0;
margin-bottom: 10px;
align-items: start;
width: max-content;
@include margin-left(auto);
@include margin-right(0);
}
my-recommended-videos {
@include padding-left(15px);
display: block;
min-width: 250px;
@include padding-left(15px);
}
my-video-comments {

View File

@ -36,10 +36,10 @@
}
my-actor-avatar {
@include margin-right(8px);
display: inline-block;
vertical-align: text-top;
@include margin-right(8px);
}
}

View File

@ -75,8 +75,6 @@
}
.peertube-title {
@include disable-default-a-behaviour;
font-size: 20px;
font-weight: $font-bold;
color: inherit !important;
@ -85,22 +83,24 @@
overflow: hidden;
padding: 0 0 0 10px;
.instance-name {
@include ellipsis;
@include disable-default-a-behaviour;
.instance-name {
width: 100%;
@include ellipsis;
@media screen and (max-width: $mobile-view) {
display: none;
}
}
.icon.icon-logo {
@include margin-right(0.5rem);
display: inline-block;
width: 23px;
height: 24px;
@include margin-right(0.5rem);
}
}

View File

@ -6,11 +6,11 @@
@include margin-right(25px);
@media screen and (max-width: $mobile-view) {
@include margin-right(10px);
padding-right: 10px;
padding-left: 10px;
@include margin-right(10px);
.icon.icon-upload {
@include margin-right(0);
}

View File

@ -3,7 +3,6 @@
#search-video {
@include peertube-input-text($search-input-width, 14px);
@include padding-left(10px);
@include padding-right(40px); // For the search icon
@ -26,9 +25,11 @@
my-global-icon {
@include icon(18px);
& {
display: inline-flex;
}
}
}
.jump-to-suggestions {
top: 100%;
@ -67,10 +68,10 @@
margin-bottom: .5rem;
em {
@include margin-right(0.2rem);
font-weight: 600;
font-style: normal;
@include margin-right(0.2rem);
}
}
}

View File

@ -2,10 +2,10 @@
@use '_mixins' as *;
a {
@include disable-default-a-behaviour;
width: 100%;
@include disable-default-a-behaviour;
&,
&:hover {
color: pvar(--mainForegroundColor);
@ -23,9 +23,9 @@ a {
}
my-global-icon {
@include apply-svg-color(pvar(--mainForegroundColor));
width: 17px;
position: relative;
top: -1px;
@include apply-svg-color(pvar(--mainForegroundColor));
}

View File

@ -56,8 +56,6 @@
min-width: 90px;
> span {
@include margin-right(5px);
display: inline-block;
color: pvar(--mainBackgroundColor);
background-color: pvar(--mainForegroundColor);
@ -67,13 +65,15 @@
box-shadow: inset 0 1px 0 #666, 0 1px 0 #bbb;
padding: 5px 9px;
font-size: 1em;
@include margin-right(5px);
}
}
.cfp-hotkeys-text {
@include padding-left(10px);
font-size: 1em;
@include padding-left(10px);
}
.cfp-hotkeys-close {

View File

@ -2,11 +2,11 @@
@use '_mixins' as *;
.help-to-translate {
border-radius: 0;
@include peertube-button-link;
@include orange-button;
border-radius: 0;
&:focus-visible,
&:focus {
box-shadow: none;

View File

@ -23,10 +23,6 @@ ul {
}
.menu-link {
@include disable-default-a-behaviour;
@include padding-left($menu-lateral-padding);
@include padding-right(20px);
display: flex;
align-items: center;
@ -38,6 +34,10 @@ ul {
line-height: $line-height-normal;
width: 100%;
@include disable-default-a-behaviour;
@include padding-left($menu-lateral-padding);
@include padding-right(20px);
&.active {
background-color: rgba(255, 255, 255, 0.15);
}
@ -48,12 +48,12 @@ ul {
}
my-global-icon {
@include apply-svg-color(#808080);
@include margin-right($menu-link-icon-margin-right);
display: flex;
width: $menu-link-icon-size;
height: $menu-link-icon-size;
@include apply-svg-color(#808080);
@include margin-right($menu-link-icon-margin-right);
}
}
@ -67,8 +67,6 @@ ul {
}
nav {
@include ellipsis;
background-color: pvar(--menuBackgroundColor);
color: pvar(--menuForegroundColor);
@ -79,6 +77,8 @@ nav {
margin: 0;
padding: 0;
@include ellipsis;
&:focus,
&:hover {
overflow-y: auto;
@ -122,6 +122,14 @@ my-notification {
}
.logged-in-more {
flex: 1;
min-width: 1px;
border-radius: 25px;
transition: all .1s ease-in-out;
cursor: pointer;
line-height: 1;
@include margin-left(13px);
@mixin display-hints($is-mobile: false) {
background-color: rgba(255, 255, 255, 0.15);
@ -133,15 +141,6 @@ my-notification {
}
}
@include margin-left(13px);
flex: 1;
min-width: 1px;
border-radius: 25px;
transition: all .1s ease-in-out;
cursor: pointer;
line-height: 1;
&.show {
background-color: rgba(255, 255, 255, 0.2);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
@ -196,10 +195,10 @@ my-actor-avatar {
}
.logged-in-display-name {
@include disable-default-a-behaviour;
font-weight: $font-semibold;
color: pvar(--menuForegroundColor);
@include disable-default-a-behaviour;
}
.logged-in-username {
@ -224,11 +223,11 @@ my-actor-avatar {
min-height: 35px;
my-global-icon {
// Keep aligned with other icons
@include margin-left($additional-margin);
width: $icon-size;
height: $icon-size;
// Keep aligned with other icons
@include margin-left($additional-margin);
}
&.active,
@ -274,14 +273,14 @@ my-actor-avatar {
margin-bottom: 15px;
.block-title {
@include ellipsis;
@include margin-left(26px);
@include margin-right(15px);
text-transform: uppercase;
font-weight: $font-bold; // Bold
font-size: 13px;
margin-bottom: 25px;
@include ellipsis;
@include margin-left(26px);
@include margin-right(15px);
}
a,
@ -301,9 +300,6 @@ my-actor-avatar {
.footer-links {
a,
button {
@include margin-right(8px);
@include disable-default-a-behaviour;
color: pvar(--menuForegroundColor);
opacity: $footer-links-base-opacity;
white-space: nowrap;
@ -311,6 +307,9 @@ my-actor-avatar {
line-height: 1.4rem;
font-weight: $font-semibold;
@include margin-right(8px);
@include disable-default-a-behaviour;
&:hover {
opacity: $footer-links-base-opacity + .2;
}
@ -318,12 +317,12 @@ my-actor-avatar {
}
.footer-copyleft a {
@include disable-default-a-behaviour;
color: pvar(--menuForegroundColor);
opacity: $footer-links-base-opacity - .2;
font-size: 0.85rem;
@include disable-default-a-behaviour;
&:hover {
opacity: $footer-links-base-opacity;
}
@ -343,12 +342,12 @@ my-actor-avatar {
}
.dropdown-item {
@include dropdown-with-icon-item;
cursor: pointer;
display: flex;
align-items: center;
@include dropdown-with-icon-item;
&:hover {
.hover-display-toggle {
display: none;
@ -390,10 +389,10 @@ my-global-icon {
top: -1px;
.playlist-icon {
@include margin-right(16px);
height: 24px;
width: 24px;
@include margin-right(16px);
}
&.channel-icon {

View File

@ -15,30 +15,30 @@
.notification-inbox-popover,
.notification-inbox-link a {
@include apply-svg-color(#808080);
transition: all .1s ease-in-out;
border-radius: 25px;
cursor: pointer;
@include apply-svg-color(#808080);
::ng-deep svg {
transition: color .1s ease-in-out;
}
&:hover,
&:active {
@include apply-svg-color(#fff);
background-color: rgba(255, 255, 255, 0.15);
@include apply-svg-color(#fff);
}
}
.notification-inbox-popover.shown,
.notification-inbox-link a.active {
@include apply-svg-color(#fff);
background-color: rgba(255, 255, 255, 0.28);
box-shadow: inset 0 3px 5px rgba(0, 0, 0, .325);
@include apply-svg-color(#fff);
}
.notification-inbox-popover.hidden {
@ -105,10 +105,10 @@
}
button {
@include peertube-button;
padding: 0;
background: transparent;
@include peertube-button;
}
a,
@ -157,11 +157,6 @@
top: 6px;
left: 0;
@media screen and (max-width: $mobile-view) {
top: -4px;
left: -2px;
}
display: flex;
align-items: center;
justify-content: center;
@ -174,5 +169,10 @@
border-radius: 15px;
width: 15px;
height: 15px;
@media screen and (max-width: $mobile-view) {
top: -4px;
left: -2px;
}
}
}

View File

@ -13,11 +13,11 @@
}
.mascot {
@include margin-right(2rem);
display: block;
width: 170px;
height: 220px;
@include margin-right(2rem);
}
.subtitle {

View File

@ -13,10 +13,10 @@
}
.mascot {
@include margin-right(2rem);
display: block;
min-width: 170px;
@include margin-right(2rem);
}
.subtitle {
@ -46,13 +46,13 @@ li {
}
.link-block {
@include disable-default-a-behaviour;
color: pvar(--mainForegroundColor);
padding: 10px;
transition: background-color 0.2s ease-in;
flex-basis: 33%;
@include disable-default-a-behaviour;
&:hover {
background-color: rgba(0, 0, 0, 0.05);
}

View File

@ -6,6 +6,7 @@
}
input[type=text] {
@include peertube-input-text(100%);
display: block;
@include peertube-input-text(100%);
}

View File

@ -10,11 +10,11 @@
.abuse-messages {
my-global-icon {
@include margin-left(3px);
width: 22px;
position: relative;
top: -2px;
@include margin-left(3px);
}
}

View File

@ -11,9 +11,9 @@ form {
}
textarea {
@include peertube-textarea(100%, 70px);
margin-top: 20px;
@include peertube-textarea(100%, 70px);
}
.messages {

View File

@ -11,11 +11,11 @@
}
.actor-info-display-name {
font-weight: $font-bold;
@include peertube-word-wrap;
@include font-size(1.25rem);
font-weight: $font-bold;
@media screen and (max-width: $small-view) {
@include font-size(18px);
}

View File

@ -6,20 +6,18 @@
}
.actor-img-edit-button {
@include peertube-button-file(30px);
@include button-with-icon;
@include peertube-button-file(31px);
@include button-with-icon(19px, 0);
@include orange-button;
& {
display: flex;
justify-content: center;
cursor: pointer;
}
input {
width: 30px;
height: 30px;
}
my-global-icon {
width: 19px;
}
}

View File

@ -20,9 +20,9 @@
column-gap: 15px;
a {
@include peertube-word-wrap;
color: pvar(--mainForegroundColor);
@include peertube-word-wrap;
}
my-actor-avatar {
@ -36,17 +36,17 @@
}
.actor-counters {
@include actor-counters(5px);
font-size: 13px;
grid-column: 2;
@include actor-counters(5px);
}
.description-html {
@include fade-text(30px, pvar(--channelBackgroundColor));
max-height: 60px;
grid-column: 2;
@include fade-text(30px, pvar(--channelBackgroundColor));
}
}

View File

@ -29,17 +29,17 @@ my-global-icon {
$size: 19px;
$margin: 2px;
@include margin-right($margin);
opacity: 1;
width: $size;
height: $size;
&.no-visible {
@include margin-right($size + $margin);
@include margin-right($margin);
&.no-visible {
width: 0;
height: 0;
@include margin-right($size + $margin);
}
}

View File

@ -2,18 +2,18 @@
@use '_mixins' as *;
input:not([type=submit]) {
@include peertube-input-text(340px);
max-width: 340px;
width: 100%;
display: block;
@include peertube-input-text(340px);
}
textarea {
@include peertube-textarea(340px, 200px);
display: block;
@include peertube-textarea(340px, 200px);
}
.peertube-select-container {

View File

@ -11,8 +11,6 @@ $input-border-radius: 3px;
flex-direction: column;
textarea {
@include peertube-textarea(100%, 150px);
background-color: pvar(--markdownTextareaBackgroundColor);
font-family: monospace;
@ -20,6 +18,8 @@ $input-border-radius: 3px;
border-bottom: 0;
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@include peertube-textarea(100%, 150px);
}
.nav-preview {

View File

@ -30,8 +30,6 @@
}
.recommended {
@include margin-left(.5rem);
align-self: baseline;
display: inline-block;
padding: 4px 6px;
@ -43,5 +41,7 @@
color: pvar(--inputPlaceholderColor);
background-color: rgba(217, 225, 232, .1);
border: 1px solid rgba(217, 225, 232, .5);
@include margin-left(.5rem);
}
}

View File

@ -15,8 +15,8 @@
}
.filename {
@include margin-left(5px);
font-weight: $font-semibold;
@include margin-left(5px);
}
}

View File

@ -45,10 +45,10 @@ ng-select ::ng-deep {
}
my-select-options + input {
@include peertube-input-text($form-base-input-width);
@include margin-left(5px);
display: block;
@include peertube-input-text($form-base-input-width);
@include margin-left(5px);
}
.input-suffix {

View File

@ -27,7 +27,9 @@ p-inputmask {
::ng-deep input {
@include peertube-input-text(80px);
& {
padding: 3px 10px;
}
}
}
}

View File

@ -15,8 +15,8 @@
}
my-global-icon {
@include margin-right(15px);
line-height: 24px;
@include margin-right(15px);
}

View File

@ -13,9 +13,9 @@ table {
}
&.sub-label {
@include padding-left(30px);
font-weight: $font-regular;
@include padding-left(30px);
}
.more-info {

View File

@ -6,10 +6,10 @@
}
.action-button {
@include peertube-button;
display: inline-block;
@include peertube-button;
&.button-styled {
&.grey {
@ -89,8 +89,7 @@
.owner-moderator-privilege {
margin: 0 !important;
width: 13px !important;
@include margin-left(0.25rem !important);
width: 13px !important;
}

View File

@ -30,11 +30,11 @@ span[class$=-button] {
width: 100%; // useful for ellipsis, allow to define a max-width on host component
my-loader.displayed {
@include margin-right(3px);
display: inline-flex;
vertical-align: middle;
margin-top: -1px;
@include margin-right(3px);
}
&.has-icon {

View File

@ -8,11 +8,11 @@
}
my-global-icon {
@include apply-svg-color(pvar(--mainColor));
width: 32px;
align-self: flex-start;
@include apply-svg-color(pvar(--mainColor));
+ div {
margin-left: 10px;
text-align: center;
@ -20,9 +20,9 @@ my-global-icon {
}
.channels-settings-link {
@include peertube-button-link;
@include grey-button;
height: fit-content;
margin-top: 10px;
@include peertube-button-link;
@include grey-button;
}

View File

@ -3,11 +3,11 @@
.help-tooltip-button {
my-global-icon {
@include apply-svg-color(pvar(--greyForegroundColor));
width: 17px;
position: relative;
top: -1px;
@include apply-svg-color(pvar(--greyForegroundColor));
}
}
@ -26,9 +26,9 @@
}
ul {
@include padding-left(20px);
margin-bottom: 0;
@include padding-left(20px);
}
}
}

View File

@ -45,8 +45,6 @@ button {
.modal-body {
a {
@include disable-default-a-behaviour;
color: currentColor;
box-sizing: border-box;
display: block;
@ -56,6 +54,8 @@ button {
text-transform: unset;
width: 100%;
@include disable-default-a-behaviour;
&.active {
color: pvar(--mainBackgroundColor) !important;
background-color: pvar(--mainHoverColor);

View File

@ -17,9 +17,9 @@ ul {
}
.dropdown-menu .dropdown-item {
@include dropdown-with-icon-item;
top: -1px;
@include dropdown-with-icon-item;
}
.sub-menu.no-scroll {
@ -31,9 +31,11 @@ ul {
display: none;
}
a {
@include disable-default-a-behaviour;
my-global-icon {
@include margin-right(10px);
}
a {
color: currentColor;
box-sizing: border-box;
display: block;
@ -43,6 +45,8 @@ ul {
text-transform: unset;
width: 100%;
@include disable-default-a-behaviour;
&.active {
color: pvar(--mainBackgroundColor) !important;
background-color: pvar(--mainHoverColor);

View File

@ -14,9 +14,7 @@
.progress {
@include disable-outline;
@include button-focus(pvar(--mainColorLightest));
@include progressbar;
height: 2rem;
@include progressbar($height: 2rem);
span {
align-self: center;

View File

@ -2,7 +2,7 @@
@use '_mixins' as *;
.pt-badge {
@include margin-right(10px);
font-size: 12px;
@include margin-right(10px);
}

View File

@ -10,13 +10,13 @@
justify-content: space-between;
.moderation-expanded-label {
@include margin-right(5px);
font-weight: $font-semibold;
display: inline-block;
vertical-align: top;
text-align: end;
min-width: 100px;
@include margin-right(5px);
}
.moderation-expanded-text {
@ -48,10 +48,10 @@ my-action-dropdown.show {
.table-comment-link,
.table-account-link {
@include disable-outline;
color: var(--mainForegroundColor);
@include disable-outline;
::ng-deep p:last-child {
margin: 0;
}

View File

@ -2,9 +2,10 @@
@use '_mixins' as *;
a {
@include disable-default-a-behaviour;
display: inline-block;
@include disable-default-a-behaviour;
&,
&:hover {
color: pvar(--mainForegroundColor);

View File

@ -11,7 +11,7 @@
<div class="modal-body">
<div class="playlist" *ngIf="playlist">
<h5 *ngIf="playlist" i18n class="text-center">Share the playlist</h5>
<h5 *ngIf="video" i18n class="text-center mb-4">Share the playlist</h5>
<div *ngIf="isPrivatePlaylist()" class="alert-private alert alert-warning">
<div i18n>This playlist is private so you won't be able to share it with external users</div>
@ -97,7 +97,7 @@
<div class="video" *ngIf="video">
<h5 *ngIf="playlist" i18n class="text-center">Share the video</h5>
<h5 *ngIf="playlist" i18n class="text-center mb-4">Share the video</h5>
<div *ngIf="isPrivateVideo()" class="alert-private alert alert-warning">
<div i18n>This video is private so you won't be able to share it with external users</div>

View File

@ -4,21 +4,22 @@
@use '_miniature' as *;
.table-video-link {
@include disable-outline;
position: relative;
top: 3px;
@include disable-outline;
}
.table-video {
display: inline-flex;
.table-video-image {
$image-height: 45px;
@include miniature-thumbnail;
@include margin-right(0.5rem);
& {
$image-height: 45px;
height: $image-height;
width: #{math.div(16, 9) * $image-height};
border-radius: 2px;
@ -27,6 +28,7 @@
display: inline-flex;
justify-content: center;
position: relative;
}
img {
height: 100%;
@ -39,8 +41,6 @@
}
.table-video-image-label {
@include static-thumbnail-overlay;
position: absolute;
border-radius: 3px;
font-size: 10px;
@ -48,6 +48,8 @@
line-height: 1.3;
bottom: 2px;
right: 2px;
@include static-thumbnail-overlay;
}
}

View File

@ -23,13 +23,13 @@
.video-thumbnail-label-overlay,
.video-thumbnail-duration-overlay,
.video-thumbnail-live-overlay {
@include static-thumbnail-overlay;
border-radius: 3px;
font-size: 12px;
font-weight: $font-semibold;
line-height: 1.1;
z-index: z(miniature);
@include static-thumbnail-overlay;
}
.video-thumbnail-label-overlay {
@ -77,9 +77,9 @@
padding: 3px;
my-global-icon {
@include apply-svg-color(#fff);
width: 22px;
height: 22px;
@include apply-svg-color(#fff);
}
}

Some files were not shown because too many files have changed in this diff Show More