From bebc6eabe5b7bab2c7eba3bc16208a445b270dfd Mon Sep 17 00:00:00 2001 From: Bettenbuk Zoltan Date: Thu, 17 Oct 2019 12:15:29 +0200 Subject: [PATCH] fix: fix and refactor AoT css --- css/_always_on_top.scss | 48 +++++++++++++++++++++++++++++++++++++++++ css/_toolbars.scss | 31 -------------------------- css/main.scss | 1 + 3 files changed, 49 insertions(+), 31 deletions(-) create mode 100644 css/_always_on_top.scss diff --git a/css/_always_on_top.scss b/css/_always_on_top.scss new file mode 100644 index 000000000..ab1e5d4f6 --- /dev/null +++ b/css/_always_on_top.scss @@ -0,0 +1,48 @@ + +.always-on-top-toolbox { + background-color: $newToolbarBackgroundColor; + border-radius: 3px; + display: flex; + flex-direction: row; + left: 50%; + position: absolute; + top: 10px; + transform: translateX(-50%); + z-index: $toolbarZ; + + .toolbox-icon { + cursor: pointer; + padding: 7px; + + &.toggled { + background: $AOTToolbarButtonToggleColor; + } + + &.disabled { + cursor: initial; + } + } + + .toolbox-button { + &:first-child { + .toolbox-icon { + border-top-left-radius: 3px; + border-bottom-left-radius: 3px; + } + } + + &:nth-child(2) { + svg { + fill: $hangupColor; + } + } + + &:last-child { + .toolbox-icon { + border-top-right-radius: 3px; + border-bottom-right-radius: 3px; + } + } + } + +} \ No newline at end of file diff --git a/css/_toolbars.scss b/css/_toolbars.scss index d21789506..9f97192d4 100644 --- a/css/_toolbars.scss +++ b/css/_toolbars.scss @@ -270,7 +270,6 @@ } } -.always-on-top-toolbox, .filmstrip-toolbox { background-color: $newToolbarBackgroundColor; box-sizing: border-box; @@ -304,36 +303,6 @@ border-radius: 3px; } -.always-on-top-toolbox { - flex-direction: row; - left: 50%; - position: absolute; - top: 10px; - transform: translateX(-50%); - z-index: $toolbarZ; - - i { - font-size: $newToolbarFontSize; - height: $newToolbarSize; - line-height: $newToolbarSize; - width: $newToolbarSize; - } - - .disabled { - cursor: initial; - } - - .toolbox-button:first-child i { - border-top-left-radius: 3px; - border-bottom-left-radius: 3px; - } - - .toolbox-button:last-child i { - border-top-right-radius: 3px; - border-bottom-right-radius: 3px; - } -} - .filmstrip-toolbox { i { font-size: 1.9em; diff --git a/css/main.scss b/css/main.scss index 9d130efff..40f5badcc 100644 --- a/css/main.scss +++ b/css/main.scss @@ -26,6 +26,7 @@ $flagsImagePath: "../images/"; /* Modules BEGIN */ @import 'aui_reset'; +@import 'always_on_top'; @import 'atlaskit_overrides'; @import 'base'; @import 'utils';