X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=7faeec6bdcc0893e370b9f38a0d5cfe4b7b67420;hb=c5a1ae500e68b759f76851552be6dd10631d34f4;hp=c7aa174ed5aa8b744d1ae5e3edecffcc61e01aa5;hpb=2860e62e236bb74102fe22f91a300dfeb9a06f40;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index c7aa174ed..7faeec6bd 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -18,6 +18,12 @@ } } + +@mixin ellipsis { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} /** * This mixin will crop text in block for needed amount of lines and put ellipsis at the end * @@ -29,7 +35,7 @@ display: block; /* Fallback for non-webkit */ display: -webkit-box; - max-height: $font-size*$line-height*$lines-to-show; + max-height: $font-size * $line-height * $lines-to-show; /* Fallback for non-webkit */ font-size: $font-size; line-height: $line-height; @@ -55,6 +61,18 @@ hyphens: auto; } +@mixin apply-svg-color ($color) { + /deep/ svg { + path[fill="#000000"], g[fill="#000000"], rect[fill="#000000"], circle[fill="#000000"] { + fill: $color; + } + + path[stroke="#000000"], g[stroke="#000000"], rect[stroke="#000000"], circle[stroke="#000000"] { + stroke: $color; + } + } +} + @mixin peertube-input-text($width) { display: inline-block; height: $button-height; @@ -64,6 +82,7 @@ border-radius: 3px; padding-left: 15px; padding-right: 15px; + font-size: 15px; &::placeholder { color: var(--inputPlaceholderColor); @@ -110,22 +129,30 @@ color: #fff; background-color: #C6C6C6; } + + my-global-icon { + @include apply-svg-color(#fff) + } } @mixin grey-button { &, &:active, &:focus { - background-color: $grey-color; - color: #585858; + background-color: $grey-background-color; + color: $grey-foreground-color; } &:hover, &:active, &:focus, &[disabled], &.disabled { - color: #585858; - background-color: $grey-hoover-color; + color: $grey-foreground-color; + background-color: $grey-background-hover-color; } &[disabled], &.disabled { cursor: default; } + + my-global-icon { + @include apply-svg-color($grey-foreground-color) + } } @mixin peertube-button { @@ -148,6 +175,15 @@ @include peertube-button; } +@mixin button-with-icon($width: 20px, $margin-right: 3px, $top: -1px) { + my-global-icon { + position: relative; + width: $width; + margin-right: $margin-right; + top: $top; + } +} + @mixin peertube-button-file ($width) { position: relative; overflow: hidden; @@ -221,6 +257,7 @@ cursor: pointer; height: $button-height; text-overflow: ellipsis; + color: var(--mainForegroundColor); &:focus { outline: none; @@ -230,6 +267,10 @@ color: transparent; text-shadow: 0 0 0 #000; } + + option { + color: #000; + } } } @@ -397,7 +438,7 @@ height: 160px; display: flex; flex-direction: column; - align-items: start; + align-items: flex-start; .actor { display: flex; @@ -454,18 +495,10 @@ } } -@mixin create-button ($imageUrl) { +@mixin create-button { @include peertube-button-link; @include orange-button; - - .icon.icon-add { - @include icon(20px); - - position: relative; - top: -1px; - margin-right: 5px; - background-image: url($imageUrl); - } + @include button-with-icon(20px, 5px, -1px); } @mixin row-blocks { @@ -483,31 +516,14 @@ } } -@mixin video-miniature-small-screen { - text-align: center; - - /deep/ .video-miniature { - padding-right: 0; - height: auto; - width: 100%; - margin-bottom: 20px; +@mixin dropdown-with-icon-item { + padding: 6px 24px; - .video-miniature-information { - width: 100% !important; + my-global-icon { + width: 24px; - span { - width: 100%; - } - } - - .video-thumbnail { - width: 100%; - height: auto; - - img { - width: 100%; - height: auto; - } - } + margin-right: 10px; + position: relative; + top: -2px; } -} \ No newline at end of file +}