ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
2,470 Commits 115 Branches 0 Tags 13 MiB
f2c7f02480
Commit Graph

424 Commits

Author SHA1 Message Date
Tim Daubenschütz
373d9d13a7 Merge branch 'master' into AP-6-polline-consignment-wallet 
Conflicts:
	js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
	js/components/whitelabel/wallet/wallet_app.js
 2016-02-08 10:03:06 +01:00
Brett Sun
826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Tim Daubenschütz
c18b70f764 Remove sass comment 2016-02-04 15:57:38 +01:00
Tim Daubenschütz
ac2319f231 Cleanup styles for polline.ascribe.io 2016-02-04 15:53:16 +01:00
Tim Daubenschütz
f6a5734871 Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00
Tim Daubenschütz
f2542f99bd Merge pull request #141 from ascribe/AG-139-specific-file-formats-leads-to-wrong-preview-sizing 
AG-139 Extract extension using file name rather that mime type for uploader preview
 2016-01-28 10:03:18 +01:00
Brett Sun
215cc3b841 Move file name to under file upload preview for smaller screens 2016-01-27 11:33:45 +01:00
Brett Sun
6a1dc7ed98 Merge with master 2016-01-26 13:50:03 +01:00
Brett Sun
627b2f75fe Extract extension using file name rather that mime type for uploader preview 
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
 2016-01-26 13:41:15 +01:00
Tim Daubenschütz
80b4e22435 Cancel dragged invalid file with proper messaging 2016-01-21 13:53:14 +01:00
Brett Sun
d75a2d257d Merge with master 2016-01-19 19:36:30 +01:00
Brett Sun
f8193a5e16 Change alignment of global notifications 
Use left text alignment for desktop  and center alignment for mobile
notifications.

Also adds a slight transition delay before showing the notification
because react can sometimes be slow at rendering the notification’s
message, making it initially appear invisible.
 2016-01-19 18:07:04 +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
5b2178eb7e Use height for landing page logos 
Using height means the browser can allocate space for the image before
it loads, so there’s no flash of movement
 2016-01-12 15:06:43 +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
3cea407ae6 Use left alignment for global notification messages 2015-12-17 13:06:42 +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.
Unfortunately, the edition's `acl_edit` can still be true when
the piece's `acl_edit` is false, so there is no good way on
the frontend right now to tell when to show the error message.

For now we'll assume submissions to marketplaces are all new
and ignore this edge case.
 2015-12-07 10:18:08 +01:00