ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-11-14 17:15:08 +01:00
Code Issues Releases Wiki Activity

width styling of forms

Browse Source
This commit is contained in:
diminator 2015-07-15 13:20:34 +02:00
parent 9ba30f0938
commit c54bbe231f
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
js/components/password_reset_container.js
View File

@ -5,7 +5,7 @@ import Router from 'react-router';
import Form from './ascribe_forms/form'; import Form from './ascribe_forms/form';
import Property from './ascribe_forms/property'; import Property from './ascribe_forms/property';
import FormPropertyHeader from './ascribe_forms/form_property_header';
import apiUrls from '../constants/api_urls'; import apiUrls from '../constants/api_urls';
import GlobalNotificationModel from '../models/global_notification_model'; import GlobalNotificationModel from '../models/global_notification_model';
@ -25,9 +25,6 @@ let PasswordResetContainer = React.createClass({
if (this.props.query.email && this.props.query.token) { if (this.props.query.email && this.props.query.token) {
return ( return (
<div> <div>
<div className="ascribe-login-text ascribe-login-header">
{getLangText('Reset the password for')} {this.props.query.email}
</div>
<PasswordResetForm <PasswordResetForm
email={this.props.query.email} email={this.props.query.email}
token={this.props.query.token}/> token={this.props.query.token}/>
@ -38,9 +35,6 @@ let PasswordResetContainer = React.createClass({
if (this.state.isRequested === false) { if (this.state.isRequested === false) {
return ( return (
<div> <div>
<div className="ascribe-login-text ascribe-login-header">
{getLangText('Reset your password')}
</div>
<PasswordRequestResetForm <PasswordRequestResetForm
handleRequestSuccess={this.handleRequestSuccess}/> handleRequestSuccess={this.handleRequestSuccess}/>
</div> </div>
@ -86,6 +80,9 @@ let PasswordRequestResetForm = React.createClass({
<img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" /> <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
</span> </span>
}> }>
<FormPropertyHeader>
<h3>{getLangText('Reset your password')}</h3>
</FormPropertyHeader>
<Property <Property
name='email' name='email'
label={getLangText('Email')}> label={getLangText('Email')}>
@ -133,6 +130,9 @@ let PasswordResetForm = React.createClass({
<img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" /> <img src="https://s3-us-west-2.amazonaws.com/ascribe0/media/thumbnails/ascribe_animated_medium.gif" />
</span> </span>
}> }>
<FormPropertyHeader>
<h3>{getLangText('Reset the password for')} {this.props.email}</h3>
</FormPropertyHeader>
<Property <Property
name='password' name='password'
label={getLangText('Password')}> label={getLangText('Password')}>

6
js/components/settings_container.js
View File

@ -32,7 +32,7 @@ let SettingsContainer = React.createClass({
render() { render() {
return ( return (
<div> <div className="settings-container">
<AccountSettings /> <AccountSettings />
<APISettings /> <APISettings />
<BitcoinWalletSettings /> <BitcoinWalletSettings />
@ -297,10 +297,10 @@ let APISettings = React.createClass({
name={app.name} name={app.name}
label={app.name}> label={app.name}>
<div className="row-same-height"> <div className="row-same-height">
<div className="no-padding col-xs-6 col-xs-height col-middle"> <div className="no-padding col-xs-6 col-sm-10 col-xs-height col-middle">
{'Bearer ' + app.bearer_token.token} {'Bearer ' + app.bearer_token.token}
</div> </div>
<div className="col-xs-6 col-xs-height"> <div className="col-xs-6 col-sm-2 col-xs-height">
<button <button
className="pull-right btn btn-default btn-sm" className="pull-right btn btn-default btn-sm"
onClick={this.handleTokenRefresh} onClick={this.handleTokenRefresh}

4
sass/ascribe_settings.scss
View File

@ -1,3 +1,7 @@
.settings-container{
max-width: 600px;
margin: auto;
}
.ascribe-settings-wrapper { .ascribe-settings-wrapper {
width: 100%; width: 100%;

5
sass/main.scss
View File

@ -44,6 +44,11 @@ hr {
margin-bottom: 15px; margin-bottom: 15px;
} }
form{
max-width: 600px;
margin: auto;
}
#main { #main {
height: 100%; height: 100%;
} }

3
sass/whitelabel/prize/landing.scss
View File

@ -1,6 +1,7 @@
.wp { .wp {
height: 100%; height: 100%;
max-width: 90%;
margin: auto;
/* We need this, otherwise piece list will have a scrollbar */ /* We need this, otherwise piece list will have a scrollbar */
overflow-x: hidden; overflow-x: hidden;
} }