From ec4f89d393319d6aaed9d570eac298b54f602f8a Mon Sep 17 00:00:00 2001 From: PenghaiZhang <47203811+PenghaiZhang@users.noreply.github.com> Date: Fri, 25 Jun 2021 12:05:56 +1000 Subject: [PATCH] Merge pull request #3141 from PenghaiZhang/feature/support-kaltura-css-in-new-ui refactor: update Kaltura TS Upload control CSS styles --- .../resources/web/sass/legacy.scss | 53 +++++++++++-------- 1 file changed, 32 insertions(+), 21 deletions(-) diff --git a/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss b/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss index 1391c1ec36..1e9ddf0eaa 100644 --- a/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss +++ b/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss @@ -280,6 +280,30 @@ $savePanelWidth: 221px; padding-left: $width; } +@mixin standardButton { + @include curvedCorners; + padding: 0 $singleMargin 0 $singleMargin; + display: inline-flex; + position: relative; + align-items: center; + justify-content: center; + box-sizing: border-box; + min-width: 64px; + border: none; + outline: none; + cursor: pointer; + background-color: $primaryColor; + color: set-text-color($primaryColor); + @include typography-button(); + + &:hover { + background-color: transparentize($primaryColor, 0.1); + } + &:active { + background-color: transparentize($primaryColor, 0.3); + } +} + /***************************************************************************** Animations *****************************************************************************/ @@ -420,27 +444,7 @@ Buttons *****************************************************************************/ .btn { - @include curvedCorners; - padding: 0 $singleMargin 0 $singleMargin; - display: inline-flex; - position: relative; - align-items: center; - justify-content: center; - box-sizing: border-box; - min-width: 64px; - border: none; - outline: none; - cursor: pointer; - background-color: $primaryColor; - color: set-text-color($primaryColor); - @include typography-button(); - - &:hover { - background-color: transparentize($primaryColor, 0.1); - } - &:active { - background-color: transparentize($primaryColor, 0.3); - } + @include standardButton; } .button-expandable { @@ -4324,6 +4328,13 @@ a.modal-control.modal-save { padding-right: $singleMargin; margin-left: $singleMargin; } + + #kaltura-simple-uploader { + input[type="submit"], + button { + @include standardButton; + } + } } .fileHandler,