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
..
ascribe-fonts	Style placeholder according to Woj's mockups	2015-10-22 11:34:51 +02:00
lib	Minor layouting fixes	2015-10-20 15:51:22 +02:00
whitelabel	Change button styles for whitelabel pages	2015-10-21 15:56:30 +02:00
ascribe_accordion_list.scss	Add thumbnail replacement for new logo	2015-10-22 10:39:11 +02:00
ascribe_acl_information.scss	Further cleanup	2015-10-20 15:10:18 +02:00
ascribe_collapsible.scss	finalize contract settings layout	2015-09-14 17:38:26 +02:00
ascribe_custom_style.scss	Fix buttons for cc	2015-10-21 14:52:25 +02:00
ascribe_edition.scss	nested collapsible paragraphs	2015-09-01 14:00:06 +02:00
ascribe_footer.scss	Change button styles for whitelabel pages	2015-10-21 15:56:30 +02:00
ascribe_form.scss	Lint scss	2015-08-31 19:04:47 +02: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	merge header - form error	2015-10-13 11:39:42 +02: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_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	Replace ascribe-green-color with new ascribe-blue-color	2015-10-21 11:34:12 +02: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	Merge remote-tracking branch 'origin/master' into AD-538-users-and-even-devs-are-unsure-wh	2015-10-22 13:38:49 +02: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	Replace ascribe-green-color with new ascribe-blue-color	2015-10-21 11:34:12 +02:00