Tim Daubenschütz
|
c464d737ba
|
Rename ascribe-logo to ascribe-font
|
2015-12-07 17:04:32 +01:00 |
|
Tim Daubenschütz
|
49421e1fa1
|
Merge branch 'master' into AD-1313-Attach-thumbnail-to-piece-in-register-form
Conflicts:
js/components/ascribe_detail/further_details_fileuploader.js
js/components/ascribe_forms/form.js
js/components/ascribe_forms/form_loan.js
js/components/ascribe_forms/form_register_piece.js
js/components/ascribe_forms/input_fineuploader.js
js/components/ascribe_forms/property.js
js/components/ascribe_forms/property_collapsible.js
js/components/ascribe_uploader/ascribe_file_drag_and_drop/file_drag_and_drop.js
js/components/ascribe_uploader/react_s3_fine_uploader.js
js/components/whitelabel/wallet/components/cyland/cyland_forms/cyland_additional_data_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artist_details_form.js
js/components/whitelabel/wallet/components/ikonotv/ikonotv_forms/ikonotv_artwork_details_form.js
sass/ascribe-fonts/ascribe-fonts.scss
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
|
2015-12-07 13:39:30 +01:00 |
|
Brett Sun
|
3be033cdd5
|
Add thumbnail placeholder for 23vivi
|
2015-12-02 19:31:50 +01:00 |
|
Tim Daubenschütz
|
943d62dd8c
|
Fix vertical centering of FileDragAndDrop previews and replace glyphicon checkmark
|
2015-11-20 17:59:26 +01:00 |
|
Tim Daubenschütz
|
12b6407cd2
|
Cleanup fonts
|
2015-11-20 15:44:09 +01:00 |
|
Tim Daubenschütz
|
46872a9cc5
|
Add checkmark glyph to project
|
2015-11-20 15:40:58 +01:00 |
|
Tim Daubenschütz
|
e6d6f86d3f
|
Style placeholder according to Woj's mockups
|
2015-10-22 11:34:51 +02:00 |
|
Tim Daubenschütz
|
b2a9eb1c7c
|
Add thumbnail replacement for new logo
|
2015-10-22 10:39:11 +02:00 |
|
Tim Daubenschütz
|
cd1cdfeede
|
Change font-weights, remove gibson from local CSS file and fix glitches
|
2015-10-21 10:35:11 +02:00 |
|
diminator
|
a457439347
|
sluice styling
|
2015-10-14 12:12:06 +02:00 |
|
diminator
|
aaa1a9a000
|
replaced fonts
replaced spinners WIP
renamed settings-property to property
|
2015-10-12 15:25:21 +02:00 |
|
diminator
|
790bf595d9
|
glyphs, spinner, piece list/edition table
|
2015-10-09 16:21:26 +02:00 |
|
diminator
|
dc8599830b
|
updated glyphs, accordion pieces ok
|
2015-10-09 13:14:29 +02:00 |
|
diminator
|
71988d502d
|
ascribe fonts
first cut layout
spinner
|
2015-10-08 11:12:15 +02:00 |
|
vrde
|
b9c8002495
|
Add ENV variable to handle BASE_URL
|
2015-06-09 17:53:44 +02:00 |
|
vrde
|
5445698eea
|
[wip] add temporary base url
|
2015-06-09 16:10:25 +02:00 |
|
vrde
|
a1bfbb8f86
|
[wip] add server to serve app
|
2015-06-08 15:24:58 +02:00 |
|
Tim Daubenschütz
|
70f333292d
|
separat fonts and images
|
2015-05-29 11:57:24 +02:00 |
|
Tim Daubenschütz
|
78d61dd1d6
|
integrate libsass and refactoring css files
|
2015-05-29 11:45:10 +02:00 |
|