Brett Sun
|
826ca08073
|
Merge with master
|
2016-02-05 10:38:59 +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 |
|
Tim Daubenschütz
|
911860ccb5
|
Finalize cancel and delete functionality for UploadButton
|
2015-12-03 10:42:55 +01:00 |
|
Brett Sun
|
8e837f8149
|
Make dropdown items have padding inside them as opposed to outside margin
Avoids weird highlighting when the items are selected.
|
2015-12-02 14:47:03 +01:00 |
|
Tim Daubenschütz
|
7d4d61e2e6
|
Restyle progress bar and fix bug in fileSelector
|
2015-11-25 10:54:29 +01:00 |
|
Tim Daubenschütz
|
ea321a4a77
|
Finalize submission flow with validation and thumbnail creation
|
2015-11-10 17:35:57 +01:00 |
|
Tim Daubenschütz
|
cc8e455a0e
|
Merge pull request #8 from ascribe/AD-1233-delete-button-is-way-to-prominent
Change delete button back to old styling
|
2015-10-28 15:56:02 +01:00 |
|
Tim Daubenschütz
|
9db85e7191
|
Change default font color to ascribe-dark-blue
|
2015-10-27 18:02:52 +01:00 |
|
Tim Daubenschütz
|
9765ed040b
|
Add tertiary button style
|
2015-10-27 17:15:23 +01:00 |
|
Brett Sun
|
c362b960dd
|
Change focused styling of logo to be normal
|
2015-10-27 16:04:28 +01:00 |
|
Brett Sun
|
7e438dcaf5
|
Add link to /collection to ascribe branding on navbar
|
2015-10-27 11:44:40 +01:00 |
|
Tim Daubenschütz
|
a9fa60eaf2
|
Fix buttons for cc
|
2015-10-21 14:52:25 +02:00 |
|
Tim Daubenschütz
|
61cb4c87a9
|
Replace ascribe-green-color with new ascribe-blue-color
|
2015-10-21 11:34:12 +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
|
74eb1ce3a2
|
spinner and some colors
***FML***
|
2015-10-16 13:30:36 +02:00 |
|
diminator
|
f8d2d39b2d
|
thumbnails, header, footer, pager
|
2015-10-16 13:00:19 +02:00 |
|
diminator
|
d7cd92eb52
|
email styles
|
2015-10-15 10:08:22 +02:00 |
|
diminator
|
b54beae322
|
cyland
cc
|
2015-10-14 17:13:16 +02:00 |
|
diminator
|
317d2611ba
|
spinners part2
scrollbar
uploader styles
property blur
|
2015-10-14 16:17:10 +02:00 |
|
diminator
|
a457439347
|
sluice styling
|
2015-10-14 12:12:06 +02:00 |
|
diminator
|
0a07106ae8
|
ikonotv styling
|
2015-10-13 13:32:48 +02:00 |
|
diminator
|
24011b773b
|
merge header - form error
|
2015-10-13 11:39:42 +02:00 |
|
diminator
|
8d970a65c4
|
spinners in forms
button wide
|
2015-10-12 17:55:02 +02:00 |
|
diminator
|
aa7c4a57e5
|
refactored property from settings
|
2015-10-12 15:34: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
|
85d3184e98
|
piece list styling
|
2015-10-09 02:00:02 +02:00 |
|
diminator
|
b7aaa9a4cf
|
collection page + footer
|
2015-10-08 20:26:29 +02:00 |
|
diminator
|
71988d502d
|
ascribe fonts
first cut layout
spinner
|
2015-10-08 11:12:15 +02:00 |
|
vrde
|
7a47cf0bfe
|
WIP, preparing styles for the new corporate identity
|
2015-09-30 18:58:21 +02:00 |
|