Merge pull request #566 from Sage-Bionetworks/update-resource-styling

update styling of resource cards
Sage-Bionetworks · Oct 6, 2019 · b51e567 · b51e567
2 parents d5d0332 + f91e142
commit b51e567
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 16 deletions.
diff --git a/client/components/resource/resource-page/resource-page.html b/client/components/resource/resource-page/resource-page.html
@@ -1,11 +1,22 @@
 <div *ngIf="resource">
     <mat-card *ngIf="!showResourceEditTemplate; else showResourceEditForm" class="app-resource">
+
         <mat-card-header class="app-resource-header">
+                <div class="app-resource-left-container">
             <mat-card-title class="app-resource-title">{{ resource.title }}</mat-card-title>
             <mat-card-subtitle
                 >{{ resource.resourceType }} created by {{ resource.createdBy.name }} on
                 {{ resource.createdAt | dateAndTime }}</mat-card-subtitle
             >
+            <mat-card-content class="app-resource-content">
+                <app-quill-editor
+                    [isReadOnly]="true"
+                    [showActions]="false"
+                    [body]="form.controls['description']"
+                ></app-quill-editor>
+            </mat-card-content>
+            </div>
+            <div class="app-resource-action-section">
             <div class="app-resource-actions">
                 <share-button [entity]="resource" [entityType]="entityType"></share-button>
                 <show-activity-button [root]="resource"></show-activity-button>
@@ -45,25 +56,23 @@
                         <span class="app-resource-actions-delete-btn-label">Delete {{ resource.resourceType }}</span>
                     </button>
                 </mat-menu>
+
             </div>
+            <div class="app-resource-extra-actions">
+                <!-- Use enum for State -->
+                <a *ngIf="resource.resourceType === 'State'" mat-raised-button color="primary" (click)="openInTool(resource)">Open with {{ tool.title }}</a>
+                <a *ngIf="resource.resourceType !== 'State'" mat-raised-button color="primary" (click)="open(resource)">Open {{ resource.resourceType }}</a>
+                <a mat-raised-button color="primary" (click)="notificationService.info('Not yet implemented')" [disabled]="true">Discuss</a>
+                    <!-- <a mat-raised-button color="primary" [routerLink]="'/discussion'">Discuss</a> -->
+                <a mat-raised-button color="primary" (click)="notificationService.info('Not yet implemented')" [disabled]="true">Create Insight</a>
+            </div>
+        </div>
+
         </mat-card-header>
 
-        <mat-card-content class="app-resource-content">
-            <app-quill-editor
-                [isReadOnly]="true"
-                [showActions]="false"
-                [body]="form.controls['description']"
-            ></app-quill-editor>
-        </mat-card-content>
 
-        <div class="app-resource-extra-actions">
-            <!-- Use enum for State -->
-            <a *ngIf="resource.resourceType === 'State'" mat-raised-button color="primary" (click)="openInTool(resource)">Open with {{ tool.title }}</a>
-            <a *ngIf="resource.resourceType !== 'State'" mat-raised-button color="primary" (click)="open(resource)">Open {{ resource.resourceType }}</a>
-            <a mat-raised-button color="primary" (click)="notificationService.info('Not yet implemented')">Discuss</a>
-                <!-- <a mat-raised-button color="primary" [routerLink]="'/discussion'">Discuss</a> -->
-            <a mat-raised-button color="primary" (click)="notificationService.info('Not yet implemented')">Create Insight</a>
-        </div>
+
+
     </mat-card>
 
     <ng-template #showResourceEditForm>

diff --git a/client/components/resource/resource-page/resource-page.scss b/client/components/resource/resource-page/resource-page.scss
@@ -6,6 +6,7 @@
     display: flex;
     flex-flow: row nowrap;
     align-items: flex-start;
+    justify-content: space-between;
 }
 
 .app-resource-title {
@@ -16,20 +17,42 @@
 .app-resource-content {
     padding-top: 8px;
     padding-bottom: 8px;
-    margin: 0 16px;
+    margin-right: 8px;
 }
 
 .app-resource-actions {
     display: flex;
     flex-flow: row nowrap;
+    justify-content: flex-end;
+    padding-bottom: 10px;
 }
 
 .app-resource-action-btn {
     margin-right: 10px;
 }
 
 .mat-card-header-text {
+    margin: 0px !important;
+}
+
+.app-resource-action-section {
+    display: flex;
+    flex-flow: column wrap;
+}
+
+.app-resource-extra-actions {
     display: flex;
     flex-flow: column nowrap;
+
+}
+
+.app-resource-extra-actions > a {
+    margin-bottom: 10px;
+}
+
+.app-resource-left-container {
+    display: flex;
+    flex-flow: column wrap;
+    margin: 5px;
     flex-grow: 1;
 }