Merge pull request #259 from harena-lab/development

Editor/style fixes

src/adonisjs/public/dccs/components/dcc-block.js

@@ -169,12 +169,13 @@ class DCCBlock extends DCCMultiVisual {
                       Basic.service.systemStyleResolver(this.elementTag() + '.css') +
                    "' </style>" + html
       } else if (this.xstyle == 'theme') {
+        if (Basic.service.currentCustomTheme != null)
+          html = "<style>@import '" +
+                   Basic.service.themeCustomStyleResolver(this.elementTag() + '.css') +
+                 "' </style>" + html
         html = "<style>@import '" +
                       Basic.service.themeStyleResolver(this.elementTag() + '.css') +
-               "' </style>\n" +
-               "<style>@import '" +
-                      Basic.service.themeCustomStyleResolver(this.elementTag() + '.css') +
-               "' </style>" + html
+               "' </style>\n" + html
       }
 
       const template = document.createElement('template')

src/adonisjs/public/dccs/edit/upload-adapter.js

@@ -31,7 +31,7 @@ class HarenaUploadAdapter {
         // integration to choose the right communication channel. This example uses
         // a POST request with JSON as a data structure but your configuration
         // could be different.
-        xhr.open( 'POST', 'http://localhost:10020/api/v1/artifact', true );
+        xhr.open( 'POST', DCCCommonServer.managerAddressAPI + 'artifact', true );
         // xhr.setRequestHeader('Content-Type', 'multipart/form-data');
         xhr.setRequestHeader('Accept', 'application/json');
         xhr.setRequestHeader('cache-control', 'no-cache');

src/adonisjs/public/themes/minimal/css/dcc-input-typed.css

@@ -0,0 +1,5 @@
+@charset "UTF-8";
+
+.dcc-input-typed-theme {
+   font-size: 30px;
+}