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
..
ascribe-fonts
lib
whitelabel	Include feedback from PR	2015-11-13 09:48:22 +01:00
ascribe_accordion_list.scss
ascribe_acl_information.scss	font size increased to 13	2015-10-29 15:44:05 +01:00
ascribe_collapsible.scss
ascribe_custom_style.scss	Finalize submission flow with validation and thumbnail creation	2015-11-10 17:35:57 +01:00
ascribe_edition.scss
ascribe_footer.scss
ascribe_form.scss	Finalize layouting submission form	2015-11-09 10:35:23 +01:00
ascribe_global_action.scss
ascribe_global_notification.scss
ascribe_login.scss
ascribe_media_player.scss
ascribe_navbar.scss
ascribe_notification_list.scss
ascribe_notification_page.scss
ascribe_panel.scss	Contract settings: break contract name on any character	2015-09-28 15:35:35 +02:00
ascribe_piece_list_bulk_modal.scss
ascribe_piece_list_toolbar.scss
ascribe_piece_register.scss
ascribe_property.scss	Add link to ToS to submission form	2015-11-12 14:48:57 +01:00
ascribe_settings.scss
ascribe_slides_container.scss
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
ascribe_table.scss
ascribe_textarea.scss
ascribe_theme.scss
ascribe_uploader.scss	Add labeling functionality to UploadButton	2015-11-12 13:08:23 +01:00
ascribe_variables.scss
glyphicons-social.scss
main.scss	Add Twitter button	2015-11-09 19:01:27 +01:00
mixins.scss
offset_right.scss
variables.scss