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

..

ascribe-fonts

sluice styling

2015-10-14 12:12:06 +02:00

lib

Remove unused ButtonSubmitOrClose and styles

2015-09-02 17:36:01 +02:00

whitelabel

spinner and some colors

2015-10-16 13:30:36 +02:00

ascribe_accordion_list.scss

spinner and some colors

2015-10-16 13:30:36 +02:00

ascribe_collapsible.scss

finalize contract settings layout

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

ascribe_custom_style.scss

spinner and some colors

2015-10-16 13:30:36 +02:00

ascribe_edition.scss

nested collapsible paragraphs

2015-09-01 14:00:06 +02:00

ascribe_footer.scss

collection page + footer

2015-10-08 20:26:29 +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

Add support for long file names

2015-09-03 16:19:02 +02:00

ascribe_navbar.scss

sluice styling

2015-10-14 12:12:06 +02:00

ascribe_notification_list.scss

collection page + footer

2015-10-08 20:26:29 +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_scrollbar.scss

spinners part2

2015-10-14 16:17:10 +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

added PR comments

2015-10-15 15:24:40 +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

spinners part2

2015-10-14 16:17:10 +02:00

ascribe_variables.scss

Lint scss

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

glyphicons-social.scss

footer + social icons

2015-07-02 15:41:17 +02:00

main.scss

thumbnails, header, footer, pager

2015-10-16 13:00:19 +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

updated glyphs, accordion pieces ok

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