OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Apply changes from Figma 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2020-04-08 14:44:34 +01:00
parent eec28ce38a
commit 4041c030a5
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
res/css/views/dialogs/_CreateRoomDialog.scss
View File

@ -77,6 +77,10 @@ limitations under the License.
width: 450px; width: 450px;
} }
.mx_Dialog_content {
margin-bottom: 40px;
}
p, p,
.mx_Field_input label { .mx_Field_input label {
color: $muted-fg-color; color: $muted-fg-color;
@ -102,11 +106,12 @@ limitations under the License.
} }
.mx_Dialog_content > .mx_SettingsFlag { .mx_Dialog_content > .mx_SettingsFlag {
margin-top: 20px; margin-top: 12px;
} }
p { p {
margin: 0 85px 0 0; margin: 0 85px 0 0;
font-size: $font-12px;
line-height: $font-24px; line-height: $font-24px;
} }
} }

2
src/components/views/dialogs/CreateRoomDialog.js
View File

@ -195,7 +195,7 @@ export default createReactClass({
if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) { if (!this.state.isPublic && SettingsStore.isFeatureEnabled("feature_cross_signing")) {
e2eeSection = <React.Fragment> e2eeSection = <React.Fragment>
<LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} /> <LabelledToggleSwitch label={ _t("Enable end-to-end encryption")} onChange={this.onEncryptedChange} value={this.state.isEncrypted} />
<p>{ _t("You can’t disable this later. Bridges & most bots currently won’t work.") }</p> <p>{ _t("You can’t disable this later. Bridges & most bots won’t work yet.") }</p>
</React.Fragment>; </React.Fragment>;
} }

2
src/i18n/strings/en_EN.json
View File

@ -1556,7 +1556,7 @@
"Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.", "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
"This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.", "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
"Enable end-to-end encryption": "Enable end-to-end encryption", "Enable end-to-end encryption": "Enable end-to-end encryption",
"You can’t disable this later. Bridges & most bots currently won’t work.": "You can’t disable this later. Bridges & most bots currently won’t work.", "You can’t disable this later. Bridges & most bots won’t work yet.": "You can’t disable this later. Bridges & most bots won’t work yet.",
"Create a public room": "Create a public room", "Create a public room": "Create a public room",
"Create a private room": "Create a private room", "Create a private room": "Create a private room",
"Name": "Name", "Name": "Name",