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

Commit

Permalink
Merge pull request #2283 from matrix-org/dbkr/e2e_backups_passphrase
Browse files Browse the repository at this point in the history
Passphrase Support for e2e backups
  • Loading branch information
dbkr committed Nov 21, 2018
2 parents 8ccaf53 + 3828798 commit db26513
Show file tree
Hide file tree
Showing 7 changed files with 517 additions and 94 deletions.
5 changes: 5 additions & 0 deletions res/css/_common.scss
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,11 @@ textarea {
opacity: 0.7;
}

.mx_linkButton {
cursor: pointer;
color: $accent-color;
}

.mx_Dialog_title {
min-height: 16px;
padding-top: 40px;
Expand Down
2 changes: 2 additions & 0 deletions res/css/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@
@import "./views/dialogs/_SetPasswordDialog.scss";
@import "./views/dialogs/_ShareDialog.scss";
@import "./views/dialogs/_UnknownDeviceDialog.scss";
@import "./views/dialogs/keybackup/_CreateKeyBackupDialog.scss";
@import "./views/dialogs/keybackup/_RestoreKeyBackupDialog.scss";
@import "./views/directory/_NetworkDropdown.scss";
@import "./views/elements/_AccessibleButton.scss";
@import "./views/elements/_AddressSelector.scss";
Expand Down
39 changes: 39 additions & 0 deletions res/css/views/dialogs/keybackup/_CreateKeyBackupDialog.scss
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 res/css/views/dialogs/keybackup/_RestoreKeyBackupDialog.scss
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;
}

Loading

0 comments on commit db26513

Please sign in to comment.