435 Commits

Author	SHA1	Message	Date
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
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
Brett Sun	384d597405	First cut of 23vivi styling	2015-12-02 14:47:19 +01:00
Brett Sun	8e837f8149	Make dropdown items have padding inside them as opposed to outside margin ... Avoids weird highlighting when the items are selected.	2015-12-02 14:47:03 +01:00
Brett Sun	ad736ad12f	Remove unnecessary hover styling on the edition list widget	2015-12-02 14:32:34 +01:00
Brett Sun	720cf472c8	Make header notification full width on mobile	2015-11-28 23:37:46 +01:00
Tim Daubenschütz	7d4d61e2e6	Restyle progress bar and fix bug in fileSelector	2015-11-25 10:54:29 +01:00
Brett Sun	efdc5d32e7	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark	2015-11-24 10:42:15 +01:00
Tim Daubenschütz	56d8268ceb	Add remove button for thumbnail creation dialog	2015-11-23 12:31:53 +01:00
Tim Daubenschütz	e134db8915	minor layouting optimizations	2015-11-23 11:05:02 +01:00
Tim Daubenschütz	943d62dd8c	Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark	2015-11-20 17:59:26 +01:00
Tim Daubenschütz	12b6407cd2	Cleanup fonts	2015-11-20 15:44:09 +01:00
Tim Daubenschütz	46872a9cc5	Add checkmark glyph to project	2015-11-20 15:40:58 +01:00
Tim Daubenschütz	efcc24ab96	Make overall upload progress percentage more visible	2015-11-20 15:24:14 +01:00
Tim Daubenschütz	96ad05cef4	Unknot (and maybe reknot) layouting for FileDragAndDrop	2015-11-20 15:02:39 +01:00
Tim Daubenschütz	1cf8ac2f31	Various small changes for FileDragAndDrop ... Changed: - If only one file submitted: hide file-specific progress bar + filename extension - Fix bug for when uploaded file is deleteable (avoid error) - Add checkmark for when file was actually submitted	2015-11-20 14:30:24 +01:00
Tim Daubenschütz	6d08540d8b	Sync thumbnail uploader to digitalWork uploader in RegisterPieceForm	2015-11-19 11:45:29 +01:00
Tim Daubenschütz	2dcd375850	Add functionality for displaying file name upon uploading single file	2015-11-19 10:43:40 +01:00
Tim Daubenschütz	25372a3edf	Include PropertyCollapsible's functionality into Property	2015-11-18 16:31:37 +01:00
Tim Daubenschütz	971d42b36d	Add file-format-specific call to action for thumbnail generation	2015-11-17 15:46:46 +01:00
Tim Daubenschütz	ac07107210	Merge branch 'master' into AD-1149-implement-lumenus-the-lumen-mark ... Conflicts: js/constants/application_constants.js js/utils/requests.js	2015-11-16 16:38:35 +01:00
Tim Daubenschütz	339421a4b7	Merge branch 'master' into AD-56-add-social-share-functionality ... Conflicts: js/components/ascribe_detail/media_container.js js/components/ascribe_media/media_player.js	2015-11-16 15:54:49 +01:00
Tim Daubenschütz	8b335cfb07	Include feedback from PR	2015-11-13 09:48:22 +01:00
Tim Daubenschütz	da09bd8649	Add link to ToS to submission form	2015-11-12 14:48:57 +01:00
Tim Daubenschütz	d1b931715d	Add spinner to submission for and make submittable on default with providing error messages	2015-11-12 13:21:10 +01:00
Tim Daubenschütz	1a67cd66f5	Add labeling functionality to UploadButton	2015-11-12 13:08:23 +01:00
Tim Daubenschütz	b6773549ee	Add proper CI colors	2015-11-12 12:04:38 +01:00
Tim Daubenschütz	5b594e9d82	left-align uploader buttons	2015-11-12 11:27:55 +01:00
Tim Daubenschütz	0438f461c2	Implement static feedback for submitted pieces	2015-11-11 16:27:50 +01:00
Tim Daubenschütz	ea321a4a77	Finalize submission flow with validation and thumbnail creation	2015-11-10 17:35:57 +01:00
Brett Sun	a9f0a46fbd	Move social share buttons to left of download button to accommodate for embed button	2015-11-10 10:29:37 +01:00
Brett Sun	8dc0470007	Add Twitter button	2015-11-09 19:01:27 +01:00
Tim Daubenschütz	9ae6b10add	Finalizing basic submission flow with lazy evaluated form	2015-11-09 17:52:09 +01:00
Tim Daubenschütz	3e22ad1d9d	Finalize layouting submission form	2015-11-09 10:35:23 +01:00
Tim Daubenschütz	7721d62319	Create boilerplate code for portfolioreview	2015-11-06 16:52:08 +01:00
Brett Sun	68c1dd9407	Merge with AD1251	2015-11-03 10:48:28 +01:00
Brett Sun	d2529bf015	Merge with master	2015-11-03 10:39:01 +01:00
Cevo	4668a42950	font size increased to 13	2015-10-29 15:44:05 +01:00
Tim Daubenschütz	cc8e455a0e	Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent ... Change delete button back to old styling	2015-10-28 15:56:02 +01:00
Tim Daubenschütz	9db85e7191	Change default font color to ascribe-dark-blue	2015-10-27 18:02:52 +01:00
Tim Daubenschütz	9765ed040b	Add tertiary button style	2015-10-27 17:15:23 +01:00
Brett Sun	c362b960dd	Change focused styling of logo to be normal	2015-10-27 16:04:28 +01:00
Brett Sun	7e438dcaf5	Add link to /collection to ascribe branding on navbar	2015-10-27 11:44:40 +01:00
Tim Daubenschütz	1f7addb886	Adding whitelabel colors for AclInformation	2015-10-23 11:34:58 +02:00
Tim Daubenschütz	3bf70628c1	Finalizing behavior of AclInformation	2015-10-23 11:24:26 +02:00
Tim Daubenschütz	cd3c8b8f6e	Complete visual styling	2015-10-23 10:37:23 +02:00
Tim Daubenschütz	e8a9cd89a4	Add resizing functionality to AclButtonList and AclInformation	2015-10-23 09:29:17 +02:00
Brett Sun	e226477424	Merge with master	2015-10-22 14:18:23 +02:00
Tim Daubenschütz	d4de2434ee	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_forms/form_share_email.js js/components/ascribe_forms/form_transfer.js js/utils/general_utils.js sass/main.scss	2015-10-22 13:38:49 +02:00
Tim Daubenschütz	e6d6f86d3f	Style placeholder according to Woj's mockups	2015-10-22 11:34:51 +02:00
Tim Daubenschütz	b2a9eb1c7c	Add thumbnail replacement for new logo	2015-10-22 10:39:11 +02:00
Brett Sun	0c51eb374e	Add Lumenus specific piece list	2015-10-21 17:37:29 +02:00
Tim Daubenschütz	2b3f33cca0	Change button styles for whitelabel pages	2015-10-21 15:56:30 +02:00
Tim Daubenschütz	a9fa60eaf2	Fix buttons for cc	2015-10-21 14:52:25 +02:00
Tim Daubenschütz	61cb4c87a9	Replace ascribe-green-color with new ascribe-blue-color	2015-10-21 11:34:12 +02:00
Tim Daubenschütz	f4b0952806	Add vendor prefixes and resolve leftover PR comments	2015-10-21 11:00:37 +02:00
Tim Daubenschütz	ba553455d2	Remove ascribe_scrollbar.scss	2015-10-21 10:56:24 +02:00
Tim Daubenschütz	cd1cdfeede	Change font-weights, remove gibson from local CSS file and fix glitches	2015-10-21 10:35:11 +02:00
Tim Daubenschütz	8d0e9a42fc	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: package.json	2015-10-20 18:11:41 +02:00
Tim Daubenschütz	beee069d3f	Minor layouting fixes	2015-10-20 15:51:22 +02:00
Tim Daubenschütz	ca03fca14a	Insert new information constants	2015-10-20 15:13:34 +02:00
Tim Daubenschütz	22a95f07fd	Further cleanup	2015-10-20 15:10:18 +02:00
Tim Daubenschütz	f0d8e32ecf	Merge remote-tracking branch 'origin/master' into AD-1080-restyle-webapp-with-new-corporate-identity ... Conflicts: js/components/ascribe_accordion_list/accordion_list_item_piece.js js/components/ascribe_app.js js/components/ascribe_piece_list_toolbar/piece_list_toolbar.js js/components/logout_container.js js/components/whitelabel/wallet/wallet_app.js	2015-10-19 10:30:14 +02:00
diminator	74eb1ce3a2	spinner and some colors ... ***FML***	2015-10-16 13:30:36 +02:00
diminator	f8d2d39b2d	thumbnails, header, footer, pager	2015-10-16 13:00:19 +02:00
Tim Daubenschütz	32d317cdef	add download button to loan form	2015-10-16 11:29:08 +02:00
diminator	ed24ec194e	added PR comments	2015-10-15 15:24:40 +02:00
Tim Daubenschütz	702f1d29f3	Styling	2015-10-15 11:41:46 +02:00
diminator	d7cd92eb52	email styles	2015-10-15 10:08:22 +02:00
Tim Daubenschütz	a1f159fc2d	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh ... Conflicts: js/components/ascribe_detail/edition.js js/utils/general_utils.js sass/main.scss	2015-10-15 10:06:39 +02:00
diminator	b54beae322	cyland ... cc	2015-10-14 17:13:16 +02:00
diminator	317d2611ba	spinners part2 ... scrollbar uploader styles property blur	2015-10-14 16:17:10 +02:00
diminator	a457439347	sluice styling	2015-10-14 12:12:06 +02:00
Cevo	b4b05b3161	information added to forms and delete form title changed, acl information component created, information text is added to the constants	2015-10-13 18:33:08 +02:00
diminator	0a07106ae8	ikonotv styling	2015-10-13 13:32:48 +02:00
diminator	24011b773b	merge header - form error	2015-10-13 11:39:42 +02:00
diminator	8d970a65c4	spinners in forms ... button wide	2015-10-12 17:55:02 +02:00
diminator	aa7c4a57e5	refactored property from settings	2015-10-12 15:34:06 +02:00