forked from matrix-org/matrix-react-sdk
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'verji-develop' of https://github.com/verji/matrix-react…
…-sdk into rm/1955-Hierarchy-UX-1
- Loading branch information
Showing
130 changed files
with
5,919 additions
and
2,207 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| name: Verji Release Drafter | ||
| on: | ||
| push: | ||
| branches: [verji-staging] | ||
| workflow_dispatch: {} | ||
| concurrency: ${{ github.workflow }} | ||
| jobs: | ||
| draft: | ||
| uses: verji/matrix-js-sdk/.github/workflows/release-drafter-workflow.yml@verji-develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /* | ||
| ROSBERG FILE | ||
| */ | ||
|
|
||
| .mx_MiscHeaderButtons { | ||
| display: flex; | ||
| &::before { | ||
| content: unset; | ||
| } | ||
| } | ||
|
|
||
| .mx_MiscHeaderButtons::before { | ||
| content: ""; | ||
| //background-color: $header-divider-color; | ||
| opacity: 0.5; | ||
| margin: 6px 8px; | ||
| border-radius: 1px; | ||
| width: 1px; | ||
| } | ||
|
|
||
| .mx_MiscHeader_miscButton { | ||
| cursor: pointer; | ||
| flex: 0 0 auto; | ||
| margin-left: 1px; | ||
| margin-right: 1px; | ||
| height: 32px; | ||
| width: 32px; | ||
| position: relative; | ||
| border-radius: 100%; | ||
|
|
||
| &::before { | ||
| content: ""; | ||
| position: absolute; | ||
| top: 4px; // center with parent of 32px | ||
| left: 4px; // center with parent of 32px | ||
| height: 24px; | ||
| width: 24px; | ||
| background-color: $icon-button-color; | ||
| mask-repeat: no-repeat; | ||
| mask-size: contain; | ||
| } | ||
|
|
||
| &:hover { | ||
| //background: rgba($accent-color, 0.1); | ||
|
|
||
| &::before { | ||
| //background-color: $accent-color; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .mx_MiscHeader_miscButton_highlight { | ||
| &::before { | ||
| //background-color: $accent-color !important; | ||
| } | ||
| } | ||
|
|
||
| .mx_MiscHeader_roomSupportButton::before { | ||
| mask-image: url("$(res)/img/element-icons/settings/help.svg"); | ||
| mask-position: center; | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
res/css/views/dialogs/_ConfirmInviteExternalUsersDialog.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| /* ROSBERG style module */ | ||
| /* NOTE: This code (and any other Rosberg .pcss/.scss files) has to be imported in here: res\css\_components.pcss */ | ||
|
|
||
| .mx_ConfirmInviteExternalUsersDialog { | ||
| &.mx_BaseDialog { | ||
| width: 480px; | ||
| } | ||
| } | ||
|
|
||
| .mx_Dialog_content { | ||
| margin-bottom: 24px; | ||
| } | ||
|
|
||
| .vmx_all_users { | ||
| display: flex; | ||
| flex-direction: row; | ||
| flex-wrap: wrap; | ||
| width: 100%; | ||
| gap: 20px; | ||
| } | ||
|
|
||
| .mx_ConfirmInviteExternalUsersDialog_user { | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex: 1; | ||
| padding: 8px; | ||
| border: 1px solid #ccc; | ||
| border-radius: 4px; | ||
|
|
||
| :first-child { | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| &_email, | ||
| &_project, | ||
| &_phoneNr { | ||
| margin-top: 4px; | ||
| font-style: italic; | ||
| white-space: nowrap; | ||
| } | ||
| } |
Oops, something went wrong.