ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #78 from ascribe/AD-1521-refactor-property-padding 

Add padding-bottom to ascribe-property instead of ascribe-property-wrapper
This commit is contained in:
Brett Sun 2016-02-04 15:15:01 +01:00
parent 9c073bb73b bf244e2bfa
commit 37608004e3
11 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/components/ascribe_forms/form_consign.js
View File

@ -123,8 +123,7 @@ let ConsignForm = React.createClass({
<Property
name='contract_agreement'
label={getLangText('Consign Contract')}
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputContractAgreementCheckbox
createPublicContractAgreement={createPublicContractAgreement}
email={email} />

5
js/components/ascribe_forms/form_copyright_association.js
View File

@ -48,8 +48,7 @@ let CopyrightAssociationForm = React.createClass({
<Property
name="copyright_association"
className="ascribe-property-collapsible-toggle"
label={getLangText('Copyright Association')}
style={{paddingBottom: 0}}>
label={getLangText('Copyright Association')}>
<select defaultValue={selectedState} name="contract">
<option
name={0}
@ -77,4 +76,4 @@ let CopyrightAssociationForm = React.createClass({
}
});
export default CopyrightAssociationForm;
export default CopyrightAssociationForm;

3
js/components/ascribe_forms/form_loan.js
View File

@ -210,8 +210,7 @@ let LoanForm = React.createClass({
<Property
name='contract_agreement'
label={getLangText('Loan Contract')}
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputContractAgreementCheckbox
createPublicContractAgreement={createPublicContractAgreement}
email={email} />

3
js/components/ascribe_forms/form_send_contract_agreement.js
View File

@ -128,8 +128,7 @@ let SendContractAgreementForm = React.createClass({
<Property
name='appendix'
checkboxLabel={getLangText('Add appendix to the contract')}
expanded={false}
style={{paddingBottom: 0}}>
expanded={false}>
<span>{getLangText('Appendix')}</span>
{/* We're using disabled on a form here as PropertyCollapsible currently
does not support the disabled + overrideForm functionality */}

5
js/components/ascribe_forms/form_signup.js
View File

@ -57,7 +57,7 @@ let SignupForm = React.createClass({
if (response.user) {
let notification = new GlobalNotificationModel(getLangText('Sign up successful'), 'success', 50000);
GlobalNotificationActions.appendGlobalNotification(notification);
// Refactor this to its own component
this.props.handleSuccess(getLangText('We sent an email to your address') + ' ' + response.user.email + ', ' + getLangText('please confirm') + '.');
} else {
@ -131,8 +131,7 @@ let SignupForm = React.createClass({
{this.props.children}
<Property
name="terms"
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputCheckbox>
<span>
{' ' + getLangText('I agree to the Terms of Service of ascribe') + ' '}

3
js/components/ascribe_forms/form_submit_to_prize.js
View File

@ -66,8 +66,7 @@ let PieceSubmitToPrizeForm = React.createClass({
</Property>
<Property
name="terms"
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputCheckbox>
<span>
{' ' + getLangText('I agree to the Terms of Service the art price') + ' '}

2
js/components/ascribe_forms/input_contract_agreement_checkbox.js
View File

@ -156,7 +156,7 @@ const InputContractAgreementCheckbox = React.createClass({
return (
<div
className="notification-contract-pdf"
style={{paddingBottom: '1em'}}>
style={{paddingBottom: '0.25em'}}>
<embed
className="embed-form"
src={contractUrl}

5
js/components/ascribe_settings/account_settings.js
View File

@ -35,7 +35,7 @@ let AccountSettings = React.createClass({
getFormDataProfile(){
return {'email': this.props.currentUser.email};
},
render() {
let content = <AscribeSpinner color='dark-blue' size='lg'/>;
let profile = null;
@ -78,8 +78,7 @@ let AccountSettings = React.createClass({
getFormData={this.getFormDataProfile}>
<Property
name="hash_locally"
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputCheckbox
defaultChecked={this.props.currentUser.profile.hash_locally}>
<span>

3
js/components/whitelabel/prize/portfolioreview/components/pr_forms/pr_register_piece_form.js
View File

@ -397,8 +397,7 @@ const PRRegisterPieceForm = React.createClass({
className="ascribe-form-bordered">
<Property
name="terms"
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<span>
{getLangText('By submitting this form, you agree to the') + ' '}
<a

3
js/components/whitelabel/prize/simple_prize/components/prize_register_piece.js
View File

@ -71,8 +71,7 @@ let PrizeRegisterPiece = React.createClass({
</Property>
<Property
name="terms"
className="ascribe-property-collapsible-toggle"
style={{paddingBottom: 0}}>
className="ascribe-property-collapsible-toggle">
<InputCheckbox>
<span>
{' ' + getLangText('I agree to the Terms of Service the art price') + ' '}

8
sass/ascribe_property.scss
View File

@ -3,7 +3,6 @@ $ascribe-red-error: rgb(169, 68, 66);
.ascribe-property-wrapper {
background-color: white;
border-left: 3px solid rgba(0, 0, 0, 0);
padding-bottom: 1em;
text-align: center;
width: 100%;
@ -37,7 +36,6 @@ $ascribe-red-error: rgb(169, 68, 66);
margin-right: 1em;
}
}
> input,
> textarea {
@ -74,9 +72,7 @@ $ascribe-red-error: rgb(169, 68, 66);
border-top: 1px solid rgba(0, 0, 0, .05);
cursor: pointer;
display: inline-block;
padding-left: 1.5em;
padding-right: 1.5em;
padding-top: 1em;
padding: 1em 1.5em;
text-align: left;
width: 100%;
@ -233,4 +229,4 @@ $ascribe-red-error: rgb(169, 68, 66);
> span > span {
margin-top: 0;
}
}
}