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
..
ascribe-fonts	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
lib	Merge with master	2015-11-03 10:39:01 +01:00
whitelabel	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_accordion_list.scss	Add thumbnail placeholder for 23vivi	2015-12-02 19:31:50 +01:00
ascribe_acl_information.scss	Merge with AD1251	2015-11-03 10:48:28 +01:00
ascribe_collapsible.scss	finalize contract settings layout	2015-09-14 17:38:26 +02:00
ascribe_custom_style.scss	Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form	2015-12-07 13:39:30 +01:00
ascribe_edition.scss	Merge with master	2015-11-03 10:39:01 +01:00
ascribe_footer.scss	Change button styles for whitelabel pages	2015-10-21 15:56:30 +02:00
ascribe_form.scss	Revert "Add consign error to market white labels"	2015-12-07 10:18:08 +01:00
ascribe_global_action.scss	notifications unoptimized	2015-09-01 14:45:14 +02:00
ascribe_global_notification.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_login.scss	spinners in forms	2015-10-12 17:55:02 +02:00
ascribe_media_player.scss	Replace ascribe-green-color with new ascribe-blue-color	2015-10-21 11:34:12 +02:00
ascribe_navbar.scss	sluice styling	2015-10-14 12:12:06 +02:00
ascribe_notification_list.scss	Make header notification full width on mobile	2015-11-28 23:37:46 +01:00
ascribe_notification_page.scss	Finalize InputContractAgreementCheckbox	2015-12-04 12:06:08 +01:00
ascribe_panel.scss	Merge pull request #46 from ascribe/AD-1149-style-23vivi	2015-12-04 13:39:09 +01:00
ascribe_piece_list_bulk_modal.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_piece_list_toolbar.scss	Merge with master	2015-10-22 14:18:23 +02:00
ascribe_piece_register.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_property.scss	Unknot (and maybe reknot) layouting for FileDragAndDrop	2015-11-20 15:02:39 +01:00
ascribe_settings.scss	refactored property from settings	2015-10-12 15:34:06 +02:00
ascribe_slides_container.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_social_share.scss	Move social share buttons to left of download button to accommodate for embed button	2015-11-10 10:29:37 +01:00
ascribe_spinner.scss	Fix ListItemEditionWidget spinner's colour	2015-12-04 14:34:59 +01:00
ascribe_table.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_textarea.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_theme.scss	Lint scss	2015-08-31 19:04:47 +02:00
ascribe_uploader.scss	Restyle progress bar and fix bug in fileSelector	2015-11-25 10:54:29 +01:00
ascribe_variables.scss	Replace ascribe-green-color with new ascribe-blue-color	2015-10-21 11:34:12 +02:00
glyphicons-social.scss	footer + social icons	2015-07-02 15:41:17 +02:00
main.scss	Change piece filter text to be normal font-weight	2015-12-03 11:54:23 +01:00
mixins.scss	Landing now iterates over colors	2015-09-22 14:46:32 +02:00
offset_right.scss	Lint scss	2015-08-31 19:04:47 +02:00
variables.scss	Merge with master	2015-11-03 10:39:01 +01:00