Merge pull request hyperledger-archives#482 from Jakeeyturner/master

Nitpick fix, updated export modal
sonyeric · Mar 16, 2017 · d6178db · d6178db
2 parents 30dba12 + 1d727ed
commit d6178db
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 87 deletions.
diff --git a/packages/composer-playground/src/app/app.module.ts b/packages/composer-playground/src/app/app.module.ts
@@ -31,7 +31,6 @@ import { SuccessComponent } from './success';
 import { ResetComponent } from './reset';
 import { FileImporterComponent } from './file-importer';
 import { ImportComponent } from './import';
-import { ExportComponent } from './export';
 import { ResourceComponent } from './resource';
 import { AddFileComponent } from './add-file';
 import { TransactionComponent } from './transaction';
@@ -85,7 +84,6 @@ type StoreType = {
   bootstrap: [ AppComponent ],
   entryComponents: [
     ImportComponent,
-    ExportComponent,
     ErrorComponent,
     SuccessComponent,
     ConfirmComponent,
@@ -111,7 +109,6 @@ type StoreType = {
     ConfirmComponent,
     ResetComponent,
     ImportComponent,
-    ExportComponent,
     GithubComponent,
     NoContentComponent,
     AboutComponent,

diff --git a/packages/composer-playground/src/app/editor/editor.component.ts b/packages/composer-playground/src/app/editor/editor.component.ts
@@ -447,9 +447,7 @@ export class EditorComponent implements OnInit {
         this.deployedPackageName + '.bna',
         { type: 'application/octet-stream' });
       saveAs(file);
-
-      this.modalService.open(ExportComponent);
-
+      this.alertService.successStatus$.next(this.deployedPackageName + '.bna was exported');
     });
   }
 

diff --git a/packages/composer-playground/src/app/export/export.component.html b/packages/composer-playground/src/app/export/export.component.html
diff --git a/packages/composer-playground/src/app/export/export.component.scss b/packages/composer-playground/src/app/export/export.component.scss
diff --git a/packages/composer-playground/src/app/export/export.component.spec.ts b/packages/composer-playground/src/app/export/export.component.spec.ts
diff --git a/packages/composer-playground/src/app/export/export.component.ts b/packages/composer-playground/src/app/export/export.component.ts
diff --git a/packages/composer-playground/src/app/export/index.ts b/packages/composer-playground/src/app/export/index.ts
diff --git a/packages/composer-playground/src/assets/styles/elements/_button.scss b/packages/composer-playground/src/assets/styles/elements/_button.scss
@@ -71,6 +71,7 @@
         color: $white;
 
       }
+
       &.active, &:active, &:focus {
         background-color: $second-highlight;
         border-color: $second-highlight;
@@ -79,8 +80,10 @@
 
       &[disabled], &[disabled]:hover {
         border-color: $fifth-highlight;
-        color: $fifth-highlight
+        color: $fifth-highlight;
+        background-color:$white;
       }
+
     }
 
     &.expand {