Merge main branch

Sage-Bionetworks · Sep 19, 2023 · 397f41b · 397f41b
2 parents 8a092a5 + 52e3032
commit 397f41b
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 23 deletions.
diff --git a/libs/openchallenges/challenge/src/lib/challenge-overview/_challenge-overview-theme.scss b/libs/openchallenges/challenge/src/lib/challenge-overview/_challenge-overview-theme.scss
@@ -6,17 +6,9 @@
   $primary: map.get($config, 'primary');
   $accent: map.get($config, 'accent');
   $figma: map.get($config, 'figma');
-
-  .text-grey {
-    color: rgba(black, 0.38);
-  }
 }
 
-@mixin typography($theme) {
-  .text-right {
-    font-weight: 600;
-  }
-}
+@mixin typography($theme) {}
 
 @mixin theme($theme) {
   $color-config: mat.get-color-config($theme);

diff --git a/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.html b/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.html
@@ -2,6 +2,10 @@
   <div id="overview">
     <h3 class="top-section-title">Overview</h3>
     <p>{{ use_default(challenge.description) }}</p>
+    <div *ngIf="challenge.description.endsWith('...')">
+      <a class="read-more" href="{{ challenge.websiteUrl }}"
+        >Continue reading <mat-icon aria-hidden="true" inline="true">open_in_new</mat-icon></a>
+    </div>
   </div>
   <div id="details">
     <h3 class="section-title">Challenge Details</h3>

diff --git a/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.ts b/libs/openchallenges/challenge/src/lib/challenge-overview/challenge-overview.component.ts
@@ -5,11 +5,12 @@ import {
   MOCK_ORGANIZATION_CARDS,
   OrganizationCard,
 } from '@sagebionetworks/openchallenges/ui';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
   selector: 'openchallenges-challenge-overview',
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, MatIconModule],
   templateUrl: './challenge-overview.component.html',
   styleUrls: ['./challenge-overview.component.scss'],
 })

diff --git a/.../openchallenges/org-profile/src/lib/org-profile-overview/_org-profile-overview-theme.scss b/.../openchallenges/org-profile/src/lib/org-profile-overview/_org-profile-overview-theme.scss
@@ -7,20 +7,9 @@
   $accent: map.get($config, 'accent');
   $warn: map.get($config, 'warn');
   $figma: map.get($config, 'figma');
-
-  .text-grey {
-    color: rgba(black, 0.38);
-  }
-  hr {
-    background-color: map.get($figma, dl-color-default-primary1);
-  }
 }
 
-@mixin typography($theme) {
-  .text-right {
-    font-weight: 600;
-  }
-}
+@mixin typography($theme) {}
 
 @mixin theme($theme) {
   $color-config: mat.get-color-config($theme);

diff --git a/...enchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.html b/...enchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.html
@@ -3,6 +3,10 @@
     <div class="col">
       <h3 class="top-section-title">Overview</h3>
       <p>{{ use_default(org.description) }}</p>
+      <div *ngIf="org.description.endsWith('...')">
+        <a class="read-more" href="{{ org.websiteUrl }}"
+          >Continue reading <mat-icon aria-hidden="true" inline="true">open_in_new</mat-icon></a>
+      </div>
     </div>
   </div>
   <div id="details">

diff --git a/...openchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.ts b/...openchallenges/org-profile/src/lib/org-profile-overview/org-profile-overview.component.ts
@@ -5,11 +5,12 @@ import {
   MOCK_ORGANIZATION_CARDS,
   OrganizationCard,
 } from '@sagebionetworks/openchallenges/ui';
+import { MatIconModule } from '@angular/material/icon';
 
 @Component({
   selector: 'openchallenges-org-profile-overview',
   standalone: true,
-  imports: [CommonModule],
+  imports: [CommonModule, MatIconModule],
   templateUrl: './org-profile-overview.component.html',
   styleUrls: ['./org-profile-overview.component.scss'],
 })

diff --git a/libs/openchallenges/styles/src/lib/_general.scss b/libs/openchallenges/styles/src/lib/_general.scss
@@ -50,6 +50,13 @@ em {
 .text-right {
   text-align: right;
 }
+.text-grey, 
+span.text-grey a {
+  color: rgba(black, 0.38);
+}
+.text-right {
+  font-weight: 600;
+}
 
 // LOGO & DESIGN
 .logo-icon {
@@ -245,6 +252,21 @@ em {
 table {
   border-spacing: 11px;
 }
+#bio div a mat-icon {
+  font-size: 15px;
+  vertical-align: middle;
+}
+.created-updated-dates,
+.created-updated-dates a,
+.read-more {
+  color: #1f3b8f;
+}
+.created-updated-dates {
+  font-style: italic !important;
+}
+.read-more {
+  text-underline-offset: 3px
+}
 
 // CARDS
 @mixin line-clamp($max-lines) {