ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-23 01:39:36 +01:00
Code Issues Releases Wiki Activity
4ae137ee9e
onion/sass
History
Tim Daubenschütz ab1cab2091 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 
Clear some merge conflicts and also some wrong merges.

BAD GIT!!!

Conflicts:
	js/components/ascribe_forms/property.js
	js/components/ascribe_uploader/react_s3_fine_uploader_utils.js
	sass/ascribe_uploader.scss
2015-09-15 13:30:24 +02:00
..
ascribe-fonts Add ENV variable to handle BASE_URL 2015-06-09 17:53:44 +02:00
lib Remove unused ButtonSubmitOrClose and styles 2015-09-02 17:36:01 +02:00
whitelabel loan request actions for multiple actions 2015-08-27 13:43:26 +02:00
ascribe_accordion_list.scss Merge remote-tracking branch 'remotes/origin/AD-456-ikonotv-branded-page-for-registra' into AD-883-show-notificationsrequests-on-col 2015-09-02 10:50:33 +02:00
ascribe_collapsible.scss fix bug in contract settings and expand actionpanel functionality 2015-09-08 11:19:11 +02:00
ascribe_edition.scss nested collapsible paragraphs 2015-09-01 14:00:06 +02:00
ascribe_footer.scss Lint scss 2015-08-31 19:04:47 +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 Lint scss 2015-08-31 19:04:47 +02:00
ascribe_media_player.scss Add support for long file names 2015-09-03 16:19:02 +02:00
ascribe_notification_list.scss refactored notifications per detail 2015-09-03 17:25:22 +02:00
ascribe_notification_page.scss added appendix 2015-09-09 14:15:00 +02:00
ascribe_panel.scss Lint scss 2015-08-31 19:04:47 +02:00
ascribe_piece_list_bulk_modal.scss Lint scss 2015-08-31 19:04:47 +02:00
ascribe_piece_list_toolbar.scss Lint scss 2015-08-31 19:04:47 +02:00
ascribe_piece_register.scss Lint scss 2015-08-31 19:04:47 +02:00
ascribe_settings.scss Lint scss 2015-08-31 19:04:47 +02:00
ascribe_slides_container.scss Lint scss 2015-08-31 19:04:47 +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 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +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 Merge remote-tracking branch 'origin/master' into AD-456-ikonotv-branded-page-for-registra 2015-09-15 13:30:24 +02:00
offset_right.scss Lint scss 2015-08-31 19:04:47 +02:00
variables.scss Lint scss 2015-08-31 19:04:47 +02:00