From 27bc95867442c772841fb183a625bbda61dede51 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 7 Jun 2021 17:38:31 +0200 Subject: Bidi support --- .../edit-custom-config/edit-custom-config.component.scss | 6 ++++-- .../follows/followers-list/followers-list.component.scss | 2 +- client/src/app/+admin/follows/follows.component.scss | 3 ++- .../video-redundancies-list.component.scss | 2 +- .../video-comment-list/video-comment-list.component.scss | 2 +- .../+admin/plugins/plugin-search/plugin-search.component.scss | 5 +++-- .../src/app/+admin/plugins/shared/plugin-list.component.scss | 9 +++++---- client/src/app/+admin/system/jobs/jobs.component.scss | 4 ++-- client/src/app/+admin/system/logs/logs.component.scss | 11 +++++++---- client/src/app/+admin/system/system.component.scss | 6 +++++- .../src/app/+admin/users/user-list/user-list.component.scss | 3 ++- 11 files changed, 33 insertions(+), 20 deletions(-) (limited to 'client/src/app/+admin') diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss index cc2a98a17..b99a779a1 100644 --- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss +++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.scss @@ -14,6 +14,7 @@ form { input[type=text] { @include peertube-input-text($form-base-input-width); + display: block; } @@ -53,13 +54,14 @@ my-select-checkbox { input[type=submit] { @include peertube-button; @include orange-button; + @include margin-left(auto); display: flex; - margin-left: auto; + .form-error { + @include margin-left(5px); + display: inline; - margin-left: 5px; } } diff --git a/client/src/app/+admin/follows/followers-list/followers-list.component.scss b/client/src/app/+admin/follows/followers-list/followers-list.component.scss index 35f38aae0..8a120bd61 100644 --- a/client/src/app/+admin/follows/followers-list/followers-list.component.scss +++ b/client/src/app/+admin/follows/followers-list/followers-list.component.scss @@ -18,6 +18,6 @@ a { .action-cell { my-button:first-child { - margin-right: 10px; + @include margin-right(10px); } } diff --git a/client/src/app/+admin/follows/follows.component.scss b/client/src/app/+admin/follows/follows.component.scss index 1ed0d925f..55256c273 100644 --- a/client/src/app/+admin/follows/follows.component.scss +++ b/client/src/app/+admin/follows/follows.component.scss @@ -1,8 +1,9 @@ @import 'mixins'; .form-sub-title { + @include margin-right(30px); + flex-grow: 0; - margin-right: 30px; } .badge { diff --git a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.scss b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.scss index 30b9f2147..ff9a83fea 100644 --- a/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.scss +++ b/client/src/app/+admin/follows/video-redundancies-list/video-redundancies-list.component.scss @@ -25,7 +25,7 @@ a { .select-filter-block { &:not(:last-child) { - margin-right: 10px; + @include margin-right(10px); } label { diff --git a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss index a6f931e3b..39e54c315 100644 --- a/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss +++ b/client/src/app/+admin/moderation/video-comment-list/video-comment-list.component.scss @@ -1,7 +1,7 @@ @import 'mixins'; my-feed { - margin-left: 5px; + @include margin-left(5px); display: inline-block; width: 15px; } diff --git a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss index 20f169e13..7e532f931 100644 --- a/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss +++ b/client/src/app/+admin/plugins/plugin-search/plugin-search.component.scss @@ -18,12 +18,13 @@ margin-bottom: 15px; my-global-icon { - margin-right: 5px; + @include margin-right(5px); } } .badge { + @include margin-left(15px); + font-size: 13px; font-weight: $font-semibold; - margin-left: 15px; } diff --git a/client/src/app/+admin/plugins/shared/plugin-list.component.scss b/client/src/app/+admin/plugins/shared/plugin-list.component.scss index 47cb1e6e5..0ca49aef4 100644 --- a/client/src/app/+admin/plugins/shared/plugin-list.component.scss +++ b/client/src/app/+admin/plugins/shared/plugin-list.component.scss @@ -12,8 +12,9 @@ margin-bottom: 10px; .plugin-name { + @include margin-right(10px); + font-size: 16px; - margin-right: 10px; font-weight: $font-semibold; } @@ -22,7 +23,7 @@ } .plugin-icon { - margin-left: 10px; + @include margin-left(10px); my-global-icon { @include apply-svg-color(pvar(--greyForegroundColor)); @@ -34,11 +35,11 @@ } .buttons { - margin-left: auto; + @include margin-left(auto); width: max-content; > *:not(:last-child) { - margin-right: 10px; + @include margin-right(10px); } } } diff --git a/client/src/app/+admin/system/jobs/jobs.component.scss b/client/src/app/+admin/system/jobs/jobs.component.scss index 65ee6ec5f..6698646cd 100644 --- a/client/src/app/+admin/system/jobs/jobs.component.scss +++ b/client/src/app/+admin/system/jobs/jobs.component.scss @@ -25,7 +25,7 @@ .select-filter-block { &:not(:last-child) { - margin-right: 10px; + @include margin-right(10px); } label { @@ -43,7 +43,7 @@ } td .glyphicon { - margin-right: 10px; + @include margin-right(10px); } pre { diff --git a/client/src/app/+admin/system/logs/logs.component.scss b/client/src/app/+admin/system/logs/logs.component.scss index 1a7c3be75..e2e5a5932 100644 --- a/client/src/app/+admin/system/logs/logs.component.scss +++ b/client/src/app/+admin/system/logs/logs.component.scss @@ -19,8 +19,9 @@ } .log-level { + @include margin-right(5px); + font-weight: $font-semibold; - margin-right: 5px; } .log-by { @@ -54,7 +55,7 @@ my-button, .peertube-select-container, ng-select { - margin-left: 10px; + @include margin-left(10px); } } @@ -65,8 +66,9 @@ .peertube-select-container, ng-select, my-button { + @include margin-left(0 !important); + width: 100% !important; - margin-left: 0 !important; margin-bottom: 10px !important; } @@ -84,8 +86,9 @@ .peertube-select-container, ng-select, my-button { + @include margin-left(0 !important); + width: 100% !important; - margin-left: 0 !important; margin-bottom: 10px !important; } diff --git a/client/src/app/+admin/system/system.component.scss b/client/src/app/+admin/system/system.component.scss index 766d7853b..3ffcb67c0 100644 --- a/client/src/app/+admin/system/system.component.scss +++ b/client/src/app/+admin/system/system.component.scss @@ -1,4 +1,8 @@ +@import '_variables'; +@import '_mixins'; + .form-sub-title { + @include margin-right(30px); + flex-grow: 0; - margin-right: 30px; } diff --git a/client/src/app/+admin/users/user-list/user-list.component.scss b/client/src/app/+admin/users/user-list/user-list.component.scss index db4979a51..f004775c0 100644 --- a/client/src/app/+admin/users/user-list/user-list.component.scss +++ b/client/src/app/+admin/users/user-list/user-list.component.scss @@ -24,9 +24,10 @@ tr.banned > td { } .user-table-primary-text .glyphicon { + @include margin-left(0.1rem); + font-size: 80%; color: #808080; - margin-left: 0.1rem; } p-tableCheckbox { -- cgit v1.2.3