From 266947e5efc7ff30b0020beb5a74e4d4fc696fa5 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 14 Apr 2021 16:39:37 +0200 Subject: Refactor modal buttons style --- client/src/sass/bootstrap.scss | 13 ++----------- client/src/sass/include/_mixins.scss | 3 ++- client/src/sass/primeng-custom.scss | 5 +++++ 3 files changed, 9 insertions(+), 12 deletions(-) (limited to 'client/src/sass') diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss index 75dc91d7a..e11603e4d 100644 --- a/client/src/sass/bootstrap.scss +++ b/client/src/sass/bootstrap.scss @@ -153,17 +153,8 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/'; margin-bottom: 0; text-align: right; - .action-button-cancel { - @include peertube-button; - @include tertiary-button; - - display: inline-block; - margin-right: 10px; - } - - .action-button-submit { - @include peertube-button; - @include orange-button; + > .peertube-button:not(:first-child) { + margin-left: 10px } } } diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index bf844ac5d..73606f940 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -238,7 +238,8 @@ font-size: 15px; height: $button-height; line-height: $button-height; - border-radius: 3px; + // FIXME: because of primeng that redefines border-radius of all input[type="..."] + border-radius: 3px !important; text-align: center; padding: 0 17px 0 13px; cursor: pointer; diff --git a/client/src/sass/primeng-custom.scss b/client/src/sass/primeng-custom.scss index 9c9b5d4fc..544d0039a 100644 --- a/client/src/sass/primeng-custom.scss +++ b/client/src/sass/primeng-custom.scss @@ -3,6 +3,11 @@ @import '~primeng/resources/primeng.css'; +// Override primeng style we don't want +input[type="button"] { + border-radius: inherit; +} + // Taken from old nova light theme body .p-disabled { -- cgit v1.2.3