This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2283 from matrix-org/dbkr/e2e_backups_passphrase
Passphrase Support for e2e backups
- Loading branch information
Showing
7 changed files
with
517 additions
and
94 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
39 changes: 39 additions & 0 deletions
39
res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.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,39 @@ | ||
/* | ||
Copyright 2018 New Vector Ltd | ||
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_CreateKeyBackupDialog_primaryContainer { | ||
/*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/ | ||
padding: 20px | ||
} | ||
|
||
.mx_CreateKeyBackupDialog_passPhraseInput { | ||
width: 300px; | ||
border: 1px solid $accent-color; | ||
border-radius: 5px; | ||
padding: 10px; | ||
} | ||
|
||
.mx_CreateKeyBackupDialog_passPhraseMatch { | ||
float: right; | ||
} | ||
|
||
.mx_CreateKeyBackupDialog_recoveryKeyButtons { | ||
float: right; | ||
} | ||
|
||
.mx_CreateKeyBackupDialog_recoveryKey { | ||
width: 300px; | ||
} |
29 changes: 29 additions & 0 deletions
29
res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.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,29 @@ | ||
/* | ||
Copyright 2018 New Vector Ltd | ||
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_RestoreKeyBackupDialog_primaryContainer { | ||
/*FIXME: plinth colour in new theme(s). background-color: $accent-color;*/ | ||
padding: 20px | ||
} | ||
|
||
.mx_RestoreKeyBackupDialog_passPhraseInput, | ||
.mx_RestoreKeyBackupDialog_recoveryKeyInput { | ||
width: 300px; | ||
border: 1px solid $accent-color; | ||
border-radius: 5px; | ||
padding: 10px; | ||
} | ||
|
Oops, something went wrong.