Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit 272aae0

Browse files
authored
Add CI to run rethemendex.sh (#9577)
1 parent ebb0e2e commit 272aae0

File tree

6 files changed

+64
-73
lines changed

6 files changed

+64
-73
lines changed

.github/workflows/static_analysis.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ jobs:
7676
name: "i18n Check"
7777
uses: matrix-org/matrix-react-sdk/.github/workflows/i18n_check.yml@develop
7878

79+
rethemendex_lint:
80+
name: "Rethemendex Check"
81+
runs-on: ubuntu-latest
82+
steps:
83+
- uses: actions/checkout@v2
84+
85+
- run: ./res/css/rethemendex.sh
86+
87+
- run: git diff --exit-code
88+
7989
js_lint:
8090
name: "ESLint"
8191
runs-on: ubuntu-latest

res/css/_common.pcss

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -793,3 +793,56 @@ legend {
793793
min-width: 18px;
794794
background-color: $secondary-content !important;
795795
}
796+
797+
@define-mixin composerButtonHighLight {
798+
background: rgba($accent, 0.25);
799+
/* make the icon the accent color too */
800+
&::before {
801+
background-color: $accent !important;
802+
}
803+
}
804+
805+
@define-mixin composerButton $border-radius,$hover-color {
806+
--size: 26px;
807+
position: relative;
808+
cursor: pointer;
809+
height: var(--size);
810+
line-height: var(--size);
811+
width: auto;
812+
padding-left: var(--size);
813+
border-radius: $border-radius;
814+
815+
&::before {
816+
content: '';
817+
position: absolute;
818+
top: 3px;
819+
left: 3px;
820+
height: 20px;
821+
width: 20px;
822+
background-color: $icon-button-color;
823+
mask-repeat: no-repeat;
824+
mask-size: contain;
825+
mask-position: center;
826+
}
827+
828+
&::after {
829+
content: '';
830+
position: absolute;
831+
left: 0;
832+
top: 0;
833+
z-index: 0;
834+
width: var(--size);
835+
height: var(--size);
836+
border-radius: $border-radius;
837+
}
838+
839+
&:hover {
840+
&::after {
841+
background: rgba($hover-color, 0.1);
842+
}
843+
844+
&::before {
845+
background-color: $hover-color;
846+
}
847+
}
848+
}

res/css/_components.pcss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@
260260
@import "./views/rooms/_AuxPanel.pcss";
261261
@import "./views/rooms/_BasicMessageComposer.pcss";
262262
@import "./views/rooms/_E2EIcon.pcss";
263-
@import "./views/rooms/_EmojiButton.pcss";
264263
@import "./views/rooms/_EditMessageComposer.pcss";
264+
@import "./views/rooms/_EmojiButton.pcss";
265265
@import "./views/rooms/_EntityTile.pcss";
266266
@import "./views/rooms/_EventBubbleTile.pcss";
267267
@import "./views/rooms/_EventTile.pcss";

res/css/views/rooms/_EmojiButton.pcss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
1616

17-
@import "./_MessageComposerButton.pcss";
18-
1917
.mx_EmojiButton {
2018
@mixin composerButton 50%,$accent;
2119
}

res/css/views/rooms/_MessageComposer.pcss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
*/
1717

18-
@import "./_MessageComposerButton.pcss";
19-
2018
.mx_MessageComposer_wrapper {
2119
vertical-align: middle;
2220
margin: auto;

res/css/views/rooms/_MessageComposerButton.pcss

Lines changed: 0 additions & 68 deletions
This file was deleted.

0 commit comments

Comments
 (0)