Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-16 21:24:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2252 from jryans/dialog-padding

Browse Source 
Repair DevTools button padding by centralizing styles
This commit is contained in:
Travis Ralston 2018-10-26 09:11:18 -06:00 committed by GitHub
commit 6c23dc0020
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
res/css/_common.scss
View File

@ -170,8 +170,7 @@ textarea {
font-weight: 300; font-weight: 300;
font-size: 15px; font-size: 15px;
position: relative; position: relative;
padding-left: 58px; padding: 0 58px 36px;
padding-bottom: 36px;
width: 60%; width: 60%;
max-width: 704px; max-width: 704px;
box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2); box-shadow: 0 1px 0 0 rgba(0, 0, 0, 0.2);
@ -216,14 +215,13 @@ textarea {
} }
.mx_Dialog_content { .mx_Dialog_content {
margin: 24px 58px 68px 0; margin: 24px 0 68px;
font-size: 14px; font-size: 14px;
color: $primary-fg-color; color: $primary-fg-color;
word-wrap: break-word; word-wrap: break-word;
} }
.mx_Dialog_buttons { .mx_Dialog_buttons {
padding-right: 58px;
text-align: right; text-align: right;
} }

4
res/css/views/dialogs/_DevtoolsDialog.scss
View File

@ -14,10 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_DevTools_dialog {
padding-right: 58px;
}
.mx_DevTools_content { .mx_DevTools_content {
margin: 10px 0; margin: 10px 0;
} }

5
res/css/views/dialogs/_ShareDialog.scss
View File

@ -14,11 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
.mx_ShareDialog {
// this is to center the content
padding-right: 58px;
}
.mx_ShareDialog hr { .mx_ShareDialog hr {
margin-top: 25px; margin-top: 25px;
margin-bottom: 25px; margin-bottom: 25px;

3
res/css/views/dialogs/_UnknownDeviceDialog.scss
View File

@ -20,9 +20,6 @@ limitations under the License.
// is a pain in the ass. plus might as well make the dialog big given how // is a pain in the ass. plus might as well make the dialog big given how
// important it is. // important it is.
height: 100%; height: 100%;
// position the gemini scrollbar nicely
padding-right: 58px;
} }
.mx_UnknownDeviceDialog { .mx_UnknownDeviceDialog {

4
src/components/views/dialogs/DevtoolsDialog.js
View File

@ -625,7 +625,7 @@ export default class DevtoolsDialog extends React.Component {
let body; let body;
if (this.state.mode) { if (this.state.mode) {
body = <div className="mx_DevTools_dialog"> body = <div>
<div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div> <div className="mx_DevTools_label_left">{ this.state.mode.getLabel() }</div>
<div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div> <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
<div className="mx_DevTools_label_bottom" /> <div className="mx_DevTools_label_bottom" />
@ -634,7 +634,7 @@ export default class DevtoolsDialog extends React.Component {
} else { } else {
const classes = "mx_DevTools_RoomStateExplorer_button"; const classes = "mx_DevTools_RoomStateExplorer_button";
body = <div> body = <div>
<div className="mx_DevTools_dialog"> <div>
<div className="mx_DevTools_label_left">{ _t('Toolbox') }</div> <div className="mx_DevTools_label_left">{ _t('Toolbox') }</div>
<div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div> <div className="mx_DevTools_label_right">Room ID: { this.props.roomId }</div>
<div className="mx_DevTools_label_bottom" /> <div className="mx_DevTools_label_bottom" />