X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fsass%2Fapplication.scss;h=9f64f74268107b7325775ef0933dc23a48d0de70;hb=d92d070c91ee73657f2e3a5756954ef63fdba306;hp=799b8c881fa7813aacd94f938d5ea024391c39e5;hpb=27bc95867442c772841fb183a625bbda61dede51;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/sass/application.scss b/client/src/sass/application.scss index 799b8c881..9f64f7426 100644 --- a/client/src/sass/application.scss +++ b/client/src/sass/application.scss @@ -1,16 +1,21 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; -@import '_bootstrap-variables'; -@import '_variables'; -@import '_mixins'; +@use 'sass:math'; -@import '_fonts'; +@use '_variables' as *; +@use '_mixins' as *; +@use '_fonts'; + +@use './classes'; + +@use './custom-markup'; + +@use './ng-select'; + +// Needs an import because we extends glyphicon icons in primeng @import './bootstrap'; @import './primeng-custom'; -@import './ng-select'; - -@import './classes'; [hidden] { display: none !important; @@ -87,7 +92,7 @@ strong { font-weight: $font-semibold; } -input.readonly { +input[readonly] { /* Force blank on readonly inputs */ background-color: pvar(--inputBackgroundColor) !important; } @@ -120,12 +125,16 @@ code { vertical-align: middle; } -.form-error { +.form-error, +.form-warning { display: block; - color: $red; margin-top: 5px; } +.form-error { + color: $red; +} + .input-error, my-input-toggle-hidden ::ng-deep input { border-color: $red !important; @@ -252,37 +261,6 @@ my-input-toggle-hidden ::ng-deep input { display: flex; align-items: center; margin-bottom: 30px; - - .form-sub-title { - flex-grow: 1; - } - - .admin-sub-nav a { - @include disable-default-a-behaviour; - - font-size: 16px; - color: pvar(--mainForegroundColor); - padding: 5px 15px; - border-radius: 0.25rem; - font-weight: $font-semibold; - opacity: 0.6; - - &.active { - background-color: pvar(--submenuBackgroundColor); - } - - &.active, - &:hover, - &:active, - &:focus { - opacity: 1; - } - } -} - -.form-sub-title { - font-size: 20px; - font-weight: bold; } // In tables, don't have a hover different background @@ -346,11 +324,11 @@ ngx-loading-bar { @media screen and (max-width: #{breakpoint(xxl)}) { .main-col { - --horizontalMarginContent: #{$not-expanded-horizontal-margins / 2}; + --horizontalMarginContent: #{math.div($not-expanded-horizontal-margins, 2)}; --videosHorizontalMarginContent: 30px; &.expanded { - --horizontalMarginContent: #{$expanded-horizontal-margins / 2}; + --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 2)}; } } } @@ -363,7 +341,7 @@ ngx-loading-bar { /* the following applies from 500px to 900px and is partially overriden from 500px to 800px by changes below to $small-view */ .main-col, .main-col.expanded { - --horizontalMarginContent: #{$expanded-horizontal-margins / 3}; + --horizontalMarginContent: #{math.div($expanded-horizontal-margins, 3)}; .sub-menu { padding: 0 50px; @@ -402,26 +380,6 @@ ngx-loading-bar { .admin-sub-header { flex-direction: column; - - .form-sub-title { - @include margin-right(0 !important); - - margin-bottom: 10px; - text-align: center; - } - - .admin-sub-nav { - display: block; - overflow-x: auto; - white-space: nowrap; - height: 50px; - padding: 10px 0; - width: 100%; - - a { - @include margin-left(5px); - } - } } my-markdown-textarea {