Skip to content

Commit

Permalink
Merge pull request #3217 from vector-im/dbkr/interactive_auth_nondialog
Browse files Browse the repository at this point in the history
Style for split-out interactive auth
  • Loading branch information
dbkr authored Feb 14, 2017
2 parents 6a7daaf + c6ccfa0 commit 1bc9ba4
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/skins/vector/css/_common.scss
Original file line number Diff line number Diff line change
@@ -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;
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;
}

0 comments on commit 1bc9ba4

Please sign in to comment.