1
0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 17:33:14 +01:00
Commit Graph

64 Commits

Author SHA1 Message Date
tim
9f0cd93c28 quickfix wrong import 2016-04-07 13:51:12 +02:00
tim
76daa7edc2 Add Liquid Gallery Whitelabel Page 2016-04-06 16:22:03 +02:00
Tim Daubenschütz
5e6b483149 Merge pull request #169 from ascribe/AG-112-visual-changes-to-23vivi
Ag 112 visual changes to 23vivi
2016-03-07 14:14:11 +01:00
Tim Daubenschütz
6301c0fe46 Refactor to route specific footer 2016-03-07 13:45:40 +01:00
Tim Daubenschütz
b80bfac2f4 Increase size of polline.ascribe.io logo 2016-03-04 14:06:44 +01:00
Tim Daubenschütz
627ace63cd Add demo whitelabel page 2016-02-24 11:16:56 +01:00
Tim Daubenschütz
d5c3024375 Hotfix: Center polline and artcity landing 2016-02-09 14:09:14 +01:00
Brett Sun
30f0008a28 Hotfix for missed PieceListToolbarWidget style renaming 2016-02-09 10:46:18 +01:00
Brett Sun
d95bdc0913 Merge with master 2016-02-08 11:43:02 +01:00
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
Brett Sun
826ca08073 Merge with master 2016-02-05 10:38:59 +01:00
Tim Daubenschütz
026261f8c7 Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:57:53 +01:00
Tim Daubenschütz
c18b70f764 Remove sass comment 2016-02-04 15:57:38 +01:00
Tim Daubenschütz
1f783dbd84 Remove sass comment 2016-02-04 15:57:05 +01:00
Tim Daubenschütz
d5f52e876e Merge branch 'AP-6-polline-consignment-wallet' into AP-7-artcity-consignment-wallet 2016-02-04 15:53:36 +01:00
Tim Daubenschütz
ac2319f231 Cleanup styles for polline.ascribe.io 2016-02-04 15:53:16 +01:00
Tim Daubenschütz
135f9f453f Cleanup styling for artcity.ascribe.io 2016-02-04 15:44:05 +01:00
Tim Daubenschütz
f12630dfad Add routes and styling for artcity.ascribe.io 2016-02-04 13:44:45 +01:00
Tim Daubenschütz
f6a5734871 Add routes and styling for polline.ascribe.io 2016-02-04 10:54:38 +01:00
Brett Sun
0d01ae1642 Remove unused btn-ascribe-add in PieceList 2016-01-27 15:01:08 +01:00
Brett Sun
50129b9d0c Refactor MarketSubmitButton to pull the piece as necessary rather than always fetching it in MarketAdditionalDataForm 2016-01-15 14:22:28 +01:00
Brett Sun
5b2178eb7e Use height for landing page logos
Using height means the browser can allocate space for the image before
it loads, so there’s no flash of movement
2016-01-12 15:06:43 +01:00
Brett Sun
441cf68fae Add initial print stylesheet overrides 2015-12-23 09:32:15 +01:00
Brett Sun
8687b393bf Add slight padding to bottom of app so it doesn't look cut off 2015-12-16 12:45:40 +01:00
Brett Sun
1ea89313ff Add custom buttons to loan form for Cyland registration 2015-12-16 12:43:03 +01:00
Brett Sun
e0a258262b Update uploader styling for 23vivi 2015-12-07 17:23:42 +01:00
Tim Daubenschütz
ddfdaa30e7 Merge fixes 2015-12-07 14:01:17 +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
5a6026d0ca Fix ListItemEditionWidget spinner's colour 2015-12-04 14:34:59 +01:00
Tim Daubenschütz
5772a5ad49 Style thumbnail upload button for whitelabels 2015-12-03 13:29:37 +01:00
Brett Sun
78b8887fbf Fix Cyland landing page
Fix font family to be Gibson, center vertically.
2015-12-03 12:44:12 +01:00
Brett Sun
cec652551e Add 23vivi landing page 2015-12-03 12:41:27 +01:00
Brett Sun
384d597405 First cut of 23vivi styling 2015-12-02 14:47:19 +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
1f7addb886 Adding whitelabel colors for AclInformation 2015-10-23 11:34:58 +02:00
Tim Daubenschütz
2b3f33cca0 Change button styles for whitelabel pages 2015-10-21 15:56:30 +02:00
Tim Daubenschütz
a9fa60eaf2 Fix buttons for cc 2015-10-21 14:52:25 +02:00
Tim Daubenschütz
f4b0952806 Add vendor prefixes and resolve leftover PR comments 2015-10-21 11:00:37 +02:00
diminator
74eb1ce3a2 spinner and some colors
***FML***
2015-10-16 13:30:36 +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
a457439347 sluice styling 2015-10-14 12:12:06 +02:00
diminator
0a07106ae8 ikonotv styling 2015-10-13 13:32:48 +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
TimDaubenschuetz
6e09d5bc16 Merged in AD-1049-fix-form-borders (pull request #78)
Fix form borders
2015-09-22 17:21:12 +02:00
vrde
172b5b7c5b Fix form borders 2015-09-22 17:11:38 +02:00
TimDaubenschuetz
dfc75824de Merged in AD-1045-revamp-flashy-landing-page (pull request #76)
Landing now iterates over colors
2015-09-22 15:18:19 +02:00
TimDaubenschuetz
30f2d75cb4 Merged in AD-1032-style-progress-and-notifications (pull request #74)
Add style for notification
2015-09-22 15:17:46 +02:00