X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Finclude%2F_mixins.scss;h=565012717ec38c873d14f8a015449f5d23f7562f;hb=6f03f944c34f78b38a68128413b55186e0676949;hp=9f6d691314c52eb1c5b3dca75cd98eceeb29dd58;hpb=fdec51e3846d50e3375612a6820ed3ab0b5fcd25;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index 9f6d69131..565012717 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -89,9 +89,10 @@ display: inline-block; height: $button-height; width: $width; + max-width: $width; color: pvar(--inputForegroundColor); background-color: pvar(--inputBackgroundColor); - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; border-radius: 3px; font-size: 15px; @@ -108,24 +109,11 @@ } } -@mixin peertube-input-group($width) { - width: $width; - min-height: $button-height; - padding-top: 0; - padding-bottom: 0; - flex-wrap: nowrap; - - .input-group-text { - font-size: 14px; - color: #808080; - } -} - @mixin peertube-textarea ($width, $height) { @include peertube-input-text($width); - color: pvar(--textareaForegroundColor); - background-color: pvar(--textareaBackgroundColor); + color: pvar(--textareaForegroundColor) !important; + background-color: pvar(--textareaBackgroundColor) !important; height: $height; padding: 5px 15px; font-size: 15px; @@ -150,7 +138,7 @@ &.disabled { cursor: default; color: #fff; - background-color: #C6C6C6; + background-color: $input-border-color; } my-global-icon { @@ -180,7 +168,7 @@ &.disabled { cursor: default; color: pvar(--mainColor); - background-color: #C6C6C6; + background-color: $input-border-color; } my-global-icon { @@ -207,7 +195,7 @@ @mixin grey-button { @include button-focus($grey-button-outline-color); - background-color: $grey-background-color; + background-color: pvar(--greyBackgroundColor); color: pvar(--greyForegroundColor); &:hover, @@ -216,7 +204,7 @@ &[disabled], &.disabled { color: pvar(--greyForegroundColor); - background-color: $grey-background-hover-color; + background-color: pvar(--greySecondaryBackgroundColor); } &[disabled], @@ -257,17 +245,35 @@ } @mixin peertube-button { - @include padding(0, 17px, 0, 13px); + padding: 0 13px; border: 0; font-weight: $font-semibold; font-size: 15px; height: $button-height; line-height: $button-height; - // FIXME: because of primeng that redefines border-radius of all input[type="..."] + + // Because of primeng that redefines border-radius of all input[type="..."] border-radius: 3px !important; + text-align: center; cursor: pointer; + + my-global-icon + * { + @include margin-right(4px); + } +} + +@mixin peertube-button-big { + height: auto; + padding: 10px 25px; + font-size: 18px; + line-height: 1.2; + border: 0; + font-weight: $font-semibold; + + // Because of primeng that redefines border-radius of all input[type="..."] + border-radius: 3px !important; } @mixin peertube-button-link { @@ -356,6 +362,7 @@ background: pvar(--inputBackgroundColor); position: relative; font-size: 15px; + height: min-content; &.disabled { background-color: #E5E5E5; @@ -365,6 +372,10 @@ } } + select[disabled] { + background-color: #f9f9f9; + } + @media screen and (max-width: $width) { width: 100%; } @@ -386,10 +397,9 @@ select { padding: 0 35px 0 12px; position: relative; - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; background: transparent none; appearance: none; - cursor: pointer; height: $button-height; text-overflow: ellipsis; color: pvar(--mainForegroundColor); @@ -405,14 +415,17 @@ option { color: #000; + + &[value=undefined] { + font-weight: $font-semibold; + } } } &.peertube-select-button { @include grey-button; - select, - option { + select { font-weight: $font-semibold; color: pvar(--greyForegroundColor); border: 0; @@ -435,6 +448,8 @@ cursor: pointer; line-height: 20px; display: inline-block; + font-size: 15px; + font-weight: $font-regular; } [type=radio]:checked + label::before, @@ -445,7 +460,7 @@ top: 0; width: 18px; height: 18px; - border: 1px solid #C6C6C6; + border: 1px solid $input-border-color; border-radius: 100%; background: #fff; } @@ -470,6 +485,13 @@ opacity: 1; transform: scale(1); } + + .form-group-description { + display: block; + margin-top: -7px; + margin-bottom: 10px; + margin-left: 29px; + } } @mixin peertube-checkbox ($border-width) { @@ -485,7 +507,7 @@ width: 18px; min-width: 18px; height: 18px; - border: $border-width solid #C6C6C6; + border: $border-width solid $input-border-color; border-radius: 3px; vertical-align: middle; cursor: pointer; @@ -531,50 +553,6 @@ } } -@mixin table-badge { - border-radius: 2px; - padding: 1/4em 1/2em; - text-transform: uppercase; - font-weight: $font-bold; - font-size: 12px; - letter-spacing: 1/3px; - - &.badge-banned, - &.badge-red { - background-color: #ffcdd2; - color: #c63737; - } - - &.badge-banned { - text-decoration: line-through; - } - - &.badge-yellow { - background-color: #feedaf; - color: #8a5340; - } - - &.badge-brown { - background-color: #ffd8b2; - color: #805b36; - } - - &.badge-green { - background-color: #c8e6c9; - color: #256029; - } - - &.badge-blue { - background-color: #b3e5fc; - color: #23547b; - } - - &.badge-purple { - background-color: #eccfff; - color: #694382; - } -} - @mixin actor-avatar-size ($size) { display: inline-block; width: $size; @@ -596,30 +574,6 @@ } } -@mixin chevron ($size, $border-width) { - border-style: solid; - border-width: $border-width $border-width 0 0; - content: ''; - display: inline-block; - transform: rotate(-45deg); - height: $size; - width: $size; -} - -@mixin chevron-right ($size, $border-width) { - @include chevron($size, $border-width); - - left: 0; - transform: rotate(45deg); -} - -@mixin chevron-left ($size, $border-width) { - @include chevron($size, $border-width); - - left: 0.25em; - transform: rotate(-135deg); -} - @mixin in-content-small-title { text-transform: uppercase; color: pvar(--mainColor); @@ -641,12 +595,15 @@ @include button-with-icon(20px, 5px, -1px); } -@mixin row-blocks ($column-responsive: true) { +@mixin row-blocks ($column-responsive: true, $min-height: 130px, $separator: true) { display: flex; - min-height: 130px; + min-height: $min-height; padding-bottom: 20px; margin-bottom: 20px; - border-bottom: 1px solid #C6C6C6; + + @if $separator { + border-bottom: 1px solid $input-border-color; + } @media screen and (max-width: $small-view) { @if $column-responsive { @@ -686,6 +643,7 @@ span { position: absolute; color: $grey-foreground-color; + @if $small { top: -1px; } @@ -708,10 +666,6 @@ white-space: nowrap; transition: width 0.6s ease; - &.secondary { - background-color: pvar(--secondaryColor); - } - &.red { background-color: lighten($color: #c54130, $amount: 10); } @@ -864,7 +818,7 @@ height: $avatar-height; my-actor-avatar { - @include actor-avatar-size($avatar-height); + display: inline-block; } div { @@ -914,8 +868,9 @@ vertical-align: top; } - .badge { + .pt-badge { @include margin-left(7px); + vertical-align: top; } }