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

Style placeholder according to Woj's mockups

2015-10-22 11:34:51 +02:00

lib

Complete visual styling

2015-10-23 10:37:23 +02:00

whitelabel

Include feedback from PR

2015-11-13 09:48:22 +01:00

ascribe_accordion_list.scss

Add thumbnail replacement for new logo

2015-10-22 10:39:11 +02:00

ascribe_acl_information.scss

font size increased to 13

2015-10-29 15:44:05 +01:00

ascribe_collapsible.scss

finalize contract settings layout

2015-09-14 17:38:26 +02:00

ascribe_custom_style.scss

Finalize submission flow with validation and thumbnail creation

2015-11-10 17:35:57 +01:00

ascribe_edition.scss

Complete visual styling

2015-10-23 10:37:23 +02:00

ascribe_footer.scss

Change button styles for whitelabel pages

2015-10-21 15:56:30 +02:00

ascribe_form.scss

Finalize layouting submission form

2015-11-09 10:35:23 +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

Replace ascribe-green-color with new ascribe-blue-color

2015-10-21 11:34:12 +02:00

ascribe_notification_page.scss

add download button to loan form

2015-10-16 11:29:08 +02:00

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

Lint scss

2015-08-31 19:04:47 +02:00

ascribe_piece_list_toolbar.scss

updated glyphs, accordion pieces ok

2015-10-09 13:14:29 +02:00

ascribe_piece_register.scss

Lint scss

2015-08-31 19:04:47 +02:00

ascribe_property.scss

Add link to ToS to submission form

2015-11-12 14:48:57 +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

Add vendor prefixes and resolve leftover PR comments

2015-10-21 11:00:37 +02: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

Add labeling functionality to UploadButton

2015-11-12 13:08:23 +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

Add Twitter button

2015-11-09 19:01:27 +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

Finalizing behavior of AclInformation

2015-10-23 11:24:26 +02:00