Brett Sun
4c821bd744
Merge pull request #35 from ascribe/AD-1360-show-common-upload-errors-to-user
...
Show more detailed upload errors and suggest solutions
2016-02-08 11:36:35 +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
a4292f09c3
Merge with master
2016-02-05 17:06:16 +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
Tim Daubenschütz
f2542f99bd
Merge pull request #141 from ascribe/AG-139-specific-file-formats-leads-to-wrong-preview-sizing
...
AG-139 Extract extension using file name rather that mime type for uploader preview
2016-01-28 10:03:18 +01:00
Brett Sun
215cc3b841
Move file name to under file upload preview for smaller screens
2016-01-27 11:33:45 +01:00
Brett Sun
6a1dc7ed98
Merge with master
2016-01-26 13:50:03 +01:00
Brett Sun
627b2f75fe
Extract extension using file name rather that mime type for uploader preview
...
Also adds ellipsis overflow to the extension name to prevent long
extensions from resizing the preview element and removes redundant
`.file-drag-and-drop-preview-table-wrapper` class
2016-01-26 13:41:15 +01:00
Tim Daubenschütz
80b4e22435
Cancel dragged invalid file with proper messaging
2016-01-21 13:53:14 +01:00
Brett Sun
d75a2d257d
Merge with master
2016-01-19 19:36:30 +01:00
Brett Sun
f8193a5e16
Change alignment of global notifications
...
Use left text alignment for desktop and center alignment for mobile
notifications.
Also adds a slight transition delay before showing the notification
because react can sometimes be slow at rendering the notification’s
message, making it initially appear invisible.
2016-01-19 18:07:04 +01:00
Brett Sun
5b7a5de332
Merge with master
2016-01-19 17:02:04 +01:00
Brett Sun
dbdef3ce6b
Merge branch 'master' into AD-1452-share-to-facebook-not-loaded
2016-01-19 10:18:52 +01:00
Brett Sun
aa00415a83
Merge with master
2016-01-18 14:15:19 +01:00
Tim Daubenschütz
600096376c
Merge pull request #64 from ascribe/show-search-bar-border
...
Always show border for collection search bar
2016-01-18 09:08:16 +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
d1a056b7d9
Use left text align for ascribe-pre
2016-01-07 18:30:27 +01:00
Brett Sun
cf6dbb26f3
Fix loading of Facebook share button
2016-01-06 15:13:09 +01:00
Brett Sun
d817b920b4
Use class to add overflow ellipsis instead of directly styling component
2015-12-23 10:20:56 +01:00
Brett Sun
6419a4e8e0
Form and property restyling in print
2015-12-23 09:49:20 +01:00
Brett Sun
5b34d569f6
Don't expand some anchor links in print
2015-12-23 09:48:45 +01:00
Brett Sun
2dc036047f
Substitute upload button for placeholder text in print
2015-12-23 09:47:30 +01:00
Brett Sun
1eea6c2cb2
Substitute COA for placeholder text in print
2015-12-23 09:46:30 +01:00
Brett Sun
8ec7023b8f
Force piece and edition layout to be two columns
2015-12-23 09:37:03 +01:00
Brett Sun
eda479a51c
Change header to be just logo in print
2015-12-23 09:36:08 +01:00
Brett Sun
441cf68fae
Add initial print stylesheet overrides
2015-12-23 09:32:15 +01:00
Brett Sun
ebd575caa3
Add prop to hide label of UploadButton
2015-12-21 11:46:46 +01:00
Brett Sun
3cea407ae6
Use left alignment for global notification messages
2015-12-17 13:06:42 +01:00
Brett Sun
b971d516cc
Fix PR feedback for Cyland loan button
2015-12-16 15:33:00 +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
5aaf02b0b4
Fire profileDidLoad event in PR to load intercom
2015-12-14 16:30:38 +01:00
Brett Sun
160c4dd82e
Always show border for collection search bar
2015-12-09 17:41:55 +01:00
diminator
00154196a4
Merge remote-tracking branch 'remotes/origin/master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 15:12:01 +01:00
Dimitri De Jonghe
c13ad64e57
Merge pull request #63 from ascribe/fix-spinner-centering
...
Fix spinner being off-center
2015-12-09 15:10:39 +01:00
Brett Sun
7525683aad
Fix spinner being off-center
2015-12-09 14:46:34 +01:00
Tim Daubenschütz
0b63801d33
Merge branch 'master' into AD-1362-implement-portfolioreview-judging-flow
2015-12-09 13:49:40 +01:00
Brett Sun
17a3ecbd44
Add thin cross icon to FileDragAndDropError
2015-12-08 20:48:39 +01:00
Brett Sun
e0b35e0a24
Merge with master
2015-12-08 20:55:13 +01:00
Brett Sun
5bc447ecc8
Allow warnings to be set from inside properties to change appearance
2015-12-08 18:23:02 +01:00
Brett Sun
79780cfb3a
Add FileDragAndDropError
2015-12-08 18:22:11 +01:00
