Brett Sun
d75a2d257d
Merge with master
2016-01-19 19:36:30 +01:00
Brett Sun
5b7a5de332
Merge with master
2016-01-19 17:02:04 +01:00
Brett Sun
dbdef3ce6b
Merge branch 'master' into AD-1452-share-to-facebook-not-loaded
2016-01-19 10:18:52 +01:00
Brett Sun
aa00415a83
Merge with master
2016-01-18 14:15:19 +01:00
Tim Daubenschütz
600096376c
Merge pull request #64 from ascribe/show-search-bar-border
...
Always show border for collection search bar
2016-01-18 09:08:16 +01:00
Brett Sun
50129b9d0c
Refactor MarketSubmitButton to pull the piece as necessary rather than always fetching it in MarketAdditionalDataForm
2016-01-15 14:22:28 +01:00
Brett Sun
d1a056b7d9
Use left text align for ascribe-pre
2016-01-07 18:30:27 +01:00
Brett Sun
cf6dbb26f3
Fix loading of Facebook share button
2016-01-06 15:13:09 +01:00
Brett Sun
d817b920b4
Use class to add overflow ellipsis instead of directly styling component
2015-12-23 10:20:56 +01:00
Brett Sun
6419a4e8e0
Form and property restyling in print
2015-12-23 09:49:20 +01:00
Brett Sun
5b34d569f6
Don't expand some anchor links in print
2015-12-23 09:48:45 +01:00
Brett Sun
2dc036047f
Substitute upload button for placeholder text in print
2015-12-23 09:47:30 +01:00
Brett Sun
1eea6c2cb2
Substitute COA for placeholder text in print
2015-12-23 09:46:30 +01:00
Brett Sun
8ec7023b8f
Force piece and edition layout to be two columns
2015-12-23 09:37:03 +01:00
Brett Sun
eda479a51c
Change header to be just logo in print
2015-12-23 09:36:08 +01:00
Brett Sun
441cf68fae
Add initial print stylesheet overrides
2015-12-23 09:32:15 +01:00
Brett Sun
ebd575caa3
Add prop to hide label of UploadButton
2015-12-21 11:46:46 +01:00
Brett Sun
b971d516cc
Fix PR feedback for Cyland loan button
2015-12-16 15:33:00 +01:00
Brett Sun
8687b393bf
Add slight padding to bottom of app so it doesn't look cut off
2015-12-16 12:45:40 +01:00
Brett Sun
1ea89313ff
Add custom buttons to loan form for Cyland registration
2015-12-16 12:43:03 +01:00
Brett Sun
5aaf02b0b4
Fire profileDidLoad event in PR to load intercom
2015-12-14 16:30:38 +01:00
Brett Sun
160c4dd82e
Always show border for collection search bar
2015-12-09 17:41:55 +01:00
diminator
00154196a4
Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 15:12:01 +01:00
Dimitri De Jonghe
c13ad64e57
Merge pull request #63 from ascribe/fix-spinner-centering
...
Fix spinner being off-center
2015-12-09 15:10:39 +01:00
Brett Sun
7525683aad
Fix spinner being off-center
2015-12-09 14:46:34 +01:00
Tim Daubenschütz
0b63801d33
Merge branch 'master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 13:49:40 +01:00
Tim Daubenschütz
cbf253adec
Merge pull request #58 from ascribe/rename-ascribe-logo-font-to-ascribe-font
...
Move ascribe-logo.* files to ascribe-font.*
2015-12-08 17:24:52 +01:00
Tim Daubenschütz
32bc4b0c69
Add custom styling for PR
2015-12-08 16:43:45 +01:00
Brett Sun
049371cc1b
Move ascribe-logo.* to ascribe-font.*
...
Also add the thin cross icon
2015-12-08 15:45:00 +01:00
Tim Daubenschütz
e427429263
Implement AuthPrizeRoleRedirect
2015-12-08 15:21:20 +01:00
Brett Sun
57c85198ed
Use line-height to center spinner-inner
2015-12-08 13:33:41 +01:00
Brett Sun
e0a258262b
Update uploader styling for 23vivi
2015-12-07 17:23:42 +01:00
Tim Daubenschütz
c464d737ba
Rename ascribe-logo to ascribe-font
2015-12-07 17:04:32 +01:00
Tim Daubenschütz
ddfdaa30e7
Merge fixes
2015-12-07 14:01:17 +01:00
Tim Daubenschütz
49421e1fa1
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
...
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
2015-12-07 13:39:30 +01:00
Tim Daubenschütz
b0b8af3305
Merge pull request #2 from ascribe/AD-1149-implement-lumenus-the-lumen-mark
...
Implement marketplace wallets
2015-12-07 10:37:22 +01:00
Brett Sun
41ef51c478
Revert "Add consign error to market white labels"
...
This reverts commit cb972eb448
2015-12-07 10:18:08 +01:00
Brett Sun
cb972eb448
Add consign error to market white labels
...
Can you beliebe? Magical 100th commit.
2015-12-04 18:30:45 +01:00
Brett Sun
5a6026d0ca
Fix ListItemEditionWidget spinner's colour
2015-12-04 14:34:59 +01:00
Brett Sun
904a6ce15a
Merge pull request #46 from ascribe/AD-1149-style-23vivi
...
AD-1149 Style 23vivi
2015-12-04 13:39:09 +01:00
Tim Daubenschütz
510318c319
Fix styling issues related to Panel in Property
2015-12-04 12:28:11 +01:00
Tim Daubenschütz
3335032609
Finalize InputContractAgreementCheckbox
2015-12-04 12:06:08 +01:00
Brett Sun
f5a527b251
Fix references to form due to nested property elements
2015-12-03 17:19:17 +01:00
Tim Daubenschütz
5772a5ad49
Style thumbnail upload button for whitelabels
2015-12-03 13:29:37 +01:00
Brett Sun
78b8887fbf
Fix Cyland landing page
...
Fix font family to be Gibson, center vertically.
2015-12-03 12:44:12 +01:00
Brett Sun
cec652551e
Add 23vivi landing page
2015-12-03 12:41:27 +01:00
Brett Sun
0084dbb8e4
Change piece filter text to be normal font-weight
2015-12-03 11:54:23 +01:00
Tim Daubenschütz
911860ccb5
Finalize cancel and delete functionality for UploadButton
2015-12-03 10:42:55 +01:00
Brett Sun
3be033cdd5
Add thumbnail placeholder for 23vivi
2015-12-02 19:31:50 +01:00
Brett Sun
ed6b80df89
Fix weird word breaks on edition action panel
2015-12-02 17:54:31 +01:00
