Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Style for split-out interactive auth #3217

Merged
merged 2 commits into from Feb 14, 2017
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/skins/vector/css/_common.scss
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 Vector Creations Ltd

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -152,6 +153,7 @@ textarea {
font-size: 15px;
position: relative;
padding-left: 58px;
padding-bottom: 36px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check this doesn't screw up the dialogs with gemini scrollbars?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, seems fine

width: 60%;
max-width: 704px;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
Expand Down Expand Up @@ -184,17 +186,20 @@ textarea {
pointer-events: none;
}

.mx_Dialog_cancelButton {
float: right;
margin-top: 5px;
margin-right: 5px;
cursor: pointer;
}

.mx_Dialog_content {
margin: 24px 58px 68px 0;
font-size: 14px;
color: $primary-fg-color;
word-wrap: break-word;
}

.mx_Dialog_buttons {
padding-bottom: 36px;
}

.mx_Dialog button, .mx_Dialog input[type="submit"] {
border: 0px;
height: 36px;
Expand Down Expand Up @@ -286,6 +291,10 @@ textarea {
display: inline;
}

.mx_button_row {
margin-top: 69px;
}

.changelog_text {
font-family: 'Open Sans', Arial, Helvetica, Sans-Serif;
}