From 272aae0973cb6e44223eda6a8b087c1c4210bbae Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Mon, 14 Nov 2022 18:31:20 +0000 Subject: [PATCH] Add CI to run rethemendex.sh (#9577) --- .github/workflows/static_analysis.yaml | 10 +++ res/css/_common.pcss | 53 +++++++++++++++ res/css/_components.pcss | 2 +- res/css/views/rooms/_EmojiButton.pcss | 2 - res/css/views/rooms/_MessageComposer.pcss | 2 - .../views/rooms/_MessageComposerButton.pcss | 68 ------------------- 6 files changed, 64 insertions(+), 73 deletions(-) delete mode 100644 res/css/views/rooms/_MessageComposerButton.pcss diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 7cfc499901..38972e0979 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -76,6 +76,16 @@ jobs: name: "i18n Check" uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop + rethemendex_lint: + name: "Rethemendex Check" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - run: ./res/css/rethemendex.sh + + - run: git diff --exit-code + js_lint: name: "ESLint" runs-on: ubuntu-latest diff --git a/res/css/_common.pcss b/res/css/_common.pcss index 4da58c1d37..305ca03570 100644 --- a/res/css/_common.pcss +++ b/res/css/_common.pcss @@ -793,3 +793,56 @@ legend { min-width: 18px; background-color: $secondary-content !important; } + +@define-mixin composerButtonHighLight { + background: rgba($accent, 0.25); + /* make the icon the accent color too */ + &::before { + background-color: $accent !important; + } +} + +@define-mixin composerButton $border-radius,$hover-color { + --size: 26px; + position: relative; + cursor: pointer; + height: var(--size); + line-height: var(--size); + width: auto; + padding-left: var(--size); + border-radius: $border-radius; + + &::before { + content: ''; + position: absolute; + top: 3px; + left: 3px; + height: 20px; + width: 20px; + background-color: $icon-button-color; + mask-repeat: no-repeat; + mask-size: contain; + mask-position: center; + } + + &::after { + content: ''; + position: absolute; + left: 0; + top: 0; + z-index: 0; + width: var(--size); + height: var(--size); + border-radius: $border-radius; + } + + &:hover { + &::after { + background: rgba($hover-color, 0.1); + } + + &::before { + background-color: $hover-color; + } + } +} diff --git a/res/css/_components.pcss b/res/css/_components.pcss index 5a263aa1e9..5e290e1375 100644 --- a/res/css/_components.pcss +++ b/res/css/_components.pcss @@ -260,8 +260,8 @@ @import "./views/rooms/_AuxPanel.pcss"; @import "./views/rooms/_BasicMessageComposer.pcss"; @import "./views/rooms/_E2EIcon.pcss"; -@import "./views/rooms/_EmojiButton.pcss"; @import "./views/rooms/_EditMessageComposer.pcss"; +@import "./views/rooms/_EmojiButton.pcss"; @import "./views/rooms/_EntityTile.pcss"; @import "./views/rooms/_EventBubbleTile.pcss"; @import "./views/rooms/_EventTile.pcss"; diff --git a/res/css/views/rooms/_EmojiButton.pcss b/res/css/views/rooms/_EmojiButton.pcss index 1720a9ce0d..aadce683d4 100644 --- a/res/css/views/rooms/_EmojiButton.pcss +++ b/res/css/views/rooms/_EmojiButton.pcss @@ -14,8 +14,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -@import "./_MessageComposerButton.pcss"; - .mx_EmojiButton { @mixin composerButton 50%,$accent; } diff --git a/res/css/views/rooms/_MessageComposer.pcss b/res/css/views/rooms/_MessageComposer.pcss index 95c7e2dd74..2906cf3e50 100644 --- a/res/css/views/rooms/_MessageComposer.pcss +++ b/res/css/views/rooms/_MessageComposer.pcss @@ -15,8 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -@import "./_MessageComposerButton.pcss"; - .mx_MessageComposer_wrapper { vertical-align: middle; margin: auto; diff --git a/res/css/views/rooms/_MessageComposerButton.pcss b/res/css/views/rooms/_MessageComposerButton.pcss deleted file mode 100644 index e21c556207..0000000000 --- a/res/css/views/rooms/_MessageComposerButton.pcss +++ /dev/null @@ -1,68 +0,0 @@ -/* -Copyright 2022 The Matrix.org Foundation C.I.C. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -@define-mixin composerButtonHighLight { - background: rgba($accent, 0.25); - /* make the icon the accent color too */ - &::before { - background-color: $accent !important; - } -} - -@define-mixin composerButton $border-radius,$hover-color { - --size: 26px; - position: relative; - cursor: pointer; - height: var(--size); - line-height: var(--size); - width: auto; - padding-left: var(--size); - border-radius: $border-radius; - - &::before { - content: ''; - position: absolute; - top: 3px; - left: 3px; - height: 20px; - width: 20px; - background-color: $icon-button-color; - mask-repeat: no-repeat; - mask-size: contain; - mask-position: center; - } - - &::after { - content: ''; - position: absolute; - left: 0; - top: 0; - z-index: 0; - width: var(--size); - height: var(--size); - border-radius: $border-radius; - } - - &:hover { - &::after { - background: rgba($hover-color, 0.1); - } - - &::before { - background-color: $hover-color; - } - } -}