Tim Daubenschütz 030a86e883 Merge branch 'master' into AP-7-artcity-consignment-wallet ...

Conflicts:
	js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
	js/components/whitelabel/wallet/wallet_app.js

2016-02-08 10:05:35 +01:00

..

ascribe-fonts

Move ascribe-logo.* to ascribe-font.*

2015-12-08 15:45:00 +01:00

lib

Merge with master

2015-11-03 10:39:01 +01:00

whitelabel

Merge branch 'master' into AP-7-artcity-consignment-wallet

2016-02-08 10:05:35 +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 with master

2016-02-05 10:38:59 +01:00

ascribe_edition.scss

Merge with master

2015-11-03 10:39:01 +01:00

ascribe_footer.scss

Add initial print stylesheet overrides

2015-12-23 09:32:15 +01:00

ascribe_form.scss

Fix PR feedback for Cyland loan button

2015-12-16 15:33:00 +01:00

ascribe_global_action.scss

notifications unoptimized

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

ascribe_global_notification.scss

Merge with master

2016-02-05 10:38:59 +01: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_print.scss

Form and property restyling in print

2015-12-23 09:49:20 +01:00

ascribe_property.scss

Merge with master

2016-02-05 10:38:59 +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

Merge with master

2016-02-05 10:38:59 +01:00

ascribe_spinner.scss

Fix spinner being off-center

2015-12-09 14:46:34 +01:00

ascribe_table.scss

Lint scss

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

ascribe_textarea.scss

Merge with master

2016-02-05 10:38:59 +01:00

ascribe_theme.scss

Lint scss

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

ascribe_uploader.scss

Merge with master

2016-02-05 10:38:59 +01:00

ascribe_variables.scss

Merge with master

2016-02-05 10:38:59 +01:00

glyphicons-social.scss

footer + social icons

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

main.scss

Use class to add overflow ellipsis instead of directly styling component

2015-12-23 10:20:56 +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