This repository was archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 813
Offer a way to create a space based on existing community #6543
Merged
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
a6e5112
Offer a way to create a space based on existing community
t3chguy 2d3211c
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy 64995df
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy f7818e0
iterate PR based on feedback
t3chguy db951b4
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy 195b871
Iterate PR based on feedback
t3chguy 77cf5bf
Update space create menu copy and add link to community migrator
t3chguy 54d85a3
Iterate PR based on feedback
t3chguy 9d3569a
Iterate PR based on feedback
t3chguy File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
187 changes: 187 additions & 0 deletions
187
res/css/views/dialogs/_CreateSpaceFromCommunityDialog.scss
This file contains hidden or 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,187 @@ | ||
| /* | ||
| Copyright 2021 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. | ||
| */ | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_wrapper { | ||
| .mx_Dialog { | ||
| display: flex; | ||
| flex-direction: column; | ||
| } | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog { | ||
| width: 480px; | ||
| color: $primary-fg-color; | ||
| display: flex; | ||
| flex-direction: column; | ||
| flex-wrap: nowrap; | ||
| min-height: 0; | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_content { | ||
| > p { | ||
| font-size: $font-15px; | ||
| line-height: $font-24px; | ||
|
|
||
| &:first-of-type { | ||
| margin-top: 0; | ||
| } | ||
|
|
||
| &.mx_CreateSpaceFromCommunityDialog_flairNotice { | ||
| font-size: $font-12px; | ||
| line-height: $font-15px; | ||
| } | ||
| } | ||
|
|
||
| .mx_SpaceBasicSettings { | ||
| > p { | ||
| font-size: $font-12px; | ||
| line-height: $font-15px; | ||
| margin: 16px 0; | ||
| } | ||
|
|
||
| .mx_Field_textarea { | ||
| margin-bottom: 0; | ||
| } | ||
| } | ||
|
|
||
| .mx_JoinRuleDropdown .mx_Dropdown_menu { | ||
| width: auto !important; // override fixed width | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_nonPublicSpacer { | ||
| height: 63px; // balance the height of the missing room alias field to prevent modal bouncing | ||
| } | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_footer { | ||
| display: flex; | ||
| margin-top: 20px; | ||
|
|
||
| > span { | ||
| flex-grow: 1; | ||
| font-size: $font-12px; | ||
| line-height: $font-15px; | ||
| color: $secondary-fg-color; | ||
|
|
||
| .mx_ProgressBar { | ||
| height: 8px; | ||
| width: 100%; | ||
|
|
||
| @mixin ProgressBarBorderRadius 8px; | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_progressText { | ||
| margin-top: 8px; | ||
| font-size: $font-15px; | ||
| line-height: $font-24px; | ||
| color: $primary-fg-color; | ||
| } | ||
|
|
||
| > * { | ||
| vertical-align: middle; | ||
| } | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_error { | ||
| padding-left: 12px; | ||
|
|
||
| > img { | ||
| align-self: center; | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_errorHeading { | ||
| font-weight: $font-semi-bold; | ||
| font-size: $font-15px; | ||
| line-height: $font-18px; | ||
| color: $notice-primary-color; | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_errorCaption { | ||
| margin-top: 4px; | ||
| font-size: $font-12px; | ||
| line-height: $font-15px; | ||
| color: $primary-fg-color; | ||
| } | ||
| } | ||
|
|
||
| .mx_AccessibleButton { | ||
| display: inline-block; | ||
| align-self: center; | ||
| } | ||
|
|
||
| .mx_AccessibleButton_kind_primary { | ||
| padding: 8px 36px; | ||
| margin-left: 24px; | ||
| } | ||
|
|
||
| .mx_AccessibleButton_kind_primary_outline { | ||
| margin-left: auto; | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_retryButton { | ||
| margin-left: 12px; | ||
| padding-left: 24px; | ||
| position: relative; | ||
|
|
||
| &::before { | ||
| content: ''; | ||
| position: absolute; | ||
| background-color: $primary-fg-color; | ||
| mask-repeat: no-repeat; | ||
| mask-position: center; | ||
| mask-size: contain; | ||
| mask-image: url('$(res)/img/element-icons/retry.svg'); | ||
| width: 18px; | ||
| height: 18px; | ||
| left: 0; | ||
| } | ||
| } | ||
|
|
||
| .mx_AccessibleButton_kind_link { | ||
| padding: 0; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog { | ||
| .mx_InfoDialog { | ||
| max-width: 500px; | ||
| } | ||
|
|
||
| .mx_AccessibleButton_kind_link { | ||
| padding: 0; | ||
| } | ||
|
|
||
| .mx_CreateSpaceFromCommunityDialog_SuccessInfoDialog_checkmark { | ||
| position: relative; | ||
| border-radius: 50%; | ||
| border: 3px solid $accent-color; | ||
| width: 68px; | ||
| height: 68px; | ||
| margin: 12px auto 32px; | ||
|
|
||
| &::before { | ||
| width: inherit; | ||
| height: inherit; | ||
| content: ''; | ||
| position: absolute; | ||
| background-color: $accent-color; | ||
| mask-repeat: no-repeat; | ||
| mask-position: center; | ||
| mask-image: url('$(res)/img/element-icons/roomlist/checkmark.svg'); | ||
| mask-size: 48px; | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.