ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

Merge fixes

Browse Source
This commit is contained in:
Tim Daubenschütz 2015-12-07 14:01:17 +01:00
parent 49421e1fa1
commit ddfdaa30e7
4 changed files with 8 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ let Form = React.createClass({
if (ref.state && 'value' in ref.state) { if (ref.state && 'value' in ref.state) {
// An input can also provide an `Object` as a value // An input can also provide an `Object` as a value
// which we're going to merge with `data` (overwrites) // which we're going to merge with `data` (overwrites)
if(ref.state.value.constructor === Object) { if(ref.state.value && ref.state.value.constructor === Object) {
Object.assign(data, ref.state.value); Object.assign(data, ref.state.value);
} else { } else {
data[ref.props.name] = ref.state.value; data[ref.props.name] = ref.state.value;

6
js/components/ascribe_forms/form_register_piece.js
View File

@ -17,9 +17,7 @@ import AscribeSpinner from '../ascribe_spinner';
import { getLangText } from '../../utils/lang_utils'; import { getLangText } from '../../utils/lang_utils';
import { mergeOptions } from '../../utils/general_utils'; import { mergeOptions } from '../../utils/general_utils';
import { formSubmissionValidation, import { formSubmissionValidation } from '../ascribe_uploader/react_s3_fine_uploader_utils';
displayValidFilesFilter,
displayRemovedFilesFilter } from '../ascribe_uploader/react_s3_fine_uploader_utils';
let RegisterPieceForm = React.createClass({ let RegisterPieceForm = React.createClass({
@ -203,7 +201,7 @@ let RegisterPieceForm = React.createClass({
fileClassToUpload={{ fileClassToUpload={{
singular: getLangText('Select representative image'), singular: getLangText('Select representative image'),
plural: getLangText('Select representative images') plural: getLangText('Select representative images')
}}/> }}
isFineUploaderActive={isFineUploaderActive} isFineUploaderActive={isFineUploaderActive}
disabled={!isFineUploaderEditable} disabled={!isFineUploaderEditable}
enableLocalHashing={enableLocalHashing} enableLocalHashing={enableLocalHashing}

1
js/components/ascribe_forms/property.js
View File

@ -248,7 +248,6 @@ const Property = React.createClass({
// if the component is actually being shown (!== 'expanded === false') // if the component is actually being shown (!== 'expanded === false')
if((this.state.expanded && this.props.checkboxLabel) || !this.props.checkboxLabel) { if((this.state.expanded && this.props.checkboxLabel) || !this.props.checkboxLabel) {
return ReactAddons.Children.map(this.props.children, (child) => { return ReactAddons.Children.map(this.props.children, (child) => {
// Since refs will be overriden by this functions return statement, // Since refs will be overriden by this functions return statement,
// we still want to be able to define refs for nested `Form` or `Property` // we still want to be able to define refs for nested `Form` or `Property`
// children, which is why we're upfront simply invoking the callback-ref- // children, which is why we're upfront simply invoking the callback-ref-

17
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
View File

@ -59,12 +59,7 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
display: none; display: none;
} }
<<<<<<< HEAD
.client--cyland .icon-ascribe-search { .client--cyland .icon-ascribe-search {
=======
.client--cyland .icon-ascribe-search{
>>>>>>> master
color: $cyland--button-color; color: $cyland--button-color;
} }
@ -147,9 +142,7 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
} }
} }
<<<<<<< HEAD .client--ikonotv {
// disabled buttons
.client--cyland {
.btn-default.disabled, .btn-default.disabled,
.btn-default.disabled:hover, .btn-default.disabled:hover,
.btn-default.disabled:focus, .btn-default.disabled:focus,
@ -170,7 +163,9 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
fieldset[disabled] .btn-default.active { fieldset[disabled] .btn-default.active {
background-color: darken($cyland--button-color, 20%); background-color: darken($cyland--button-color, 20%);
border-color: darken($cyland--button-color, 20%); border-color: darken($cyland--button-color, 20%);
======= }
}
// landing page // landing page
.client--cyland { .client--cyland {
.route--landing { .route--landing {
@ -186,7 +181,6 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
font-weight: normal; font-weight: normal;
text-align: center; text-align: center;
} }
>>>>>>> master
} }
} }
@ -225,7 +219,6 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
.client--cyland .acl-information-dropdown-list .title { .client--cyland .acl-information-dropdown-list .title {
color: $cyland--button-color; color: $cyland--button-color;
} }
<<<<<<< HEAD
.client--cyland .action-file.icon-ascribe-ok, .client--cyland .action-file.icon-ascribe-ok,
.client--cyland .action-file.icon-ascribe-ok:hover { .client--cyland .action-file.icon-ascribe-ok:hover {
@ -242,5 +235,3 @@ $cyland--button-color: $cyland--nav-fg-prim-color;
.client--cyland .upload-button-wrapper > span { .client--cyland .upload-button-wrapper > span {
color: $cyland--button-color; color: $cyland--button-color;
} }
=======
>>>>>>> master