fix build and css first page load related issues

CSCfi · Oct 22, 2024 · 07636bc · 07636bc
1 parent 486f824
commit 07636bc
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 13 deletions.
diff --git a/angular.json b/angular.json
@@ -144,8 +144,10 @@
               "src/favicon.ico",
               "src/assets"
             ],
-            "styles": [
-              "src/styles.scss"
+            "styles": [{
+              "input": "src/styles.scss",
+              "inject": false
+            }
             ],
             "stylePreprocessorOptions": {
               "includePaths": ["src"]

diff --git a/src/app/portal/components/results/results.component.scss b/src/app/portal/components/results/results.component.scss
@@ -100,6 +100,11 @@ span.total {
 .visual-button-container {
   padding: 15px 0;
   margin-bottom: 10px;
+  app-primary-action-button {
+    min-width: 188.25px !important;
+    max-height: 44px !important;
+    white-space: nowrap;
+  }
 }
 
 .modal-header {

diff --git a/src/app/shared/components/tags/tag-open-access/tag-open-access.component.html b/src/app/shared/components/tags/tag-open-access/tag-open-access.component.html
@@ -4,17 +4,17 @@
  :license: MIT -->
 
 <div class="tag open-access rounded">
-  <a *ngIf="link.length > 0; else plainText" [href]="link" target="_blank">
-    <ng-container [ngTemplateOutlet]="tabContent"></ng-container>
-    <fa-icon icon="external-link-alt"></fa-icon>
+  <a *ngIf="link.length > 0" [href]="link" target="_blank">
+    <div class="d-flex">
+      <img src="assets/img/openaccess.svg" />
+      <span class="fw-bold" i18n="@@openAccess">Avoin saatavuus</span>
+      <fa-icon icon="external-link-alt"></fa-icon>
+    </div>
   </a>
 
-  <ng-template #plainText>
-    <ng-container [ngTemplateOutlet]="tabContent"></ng-container>
-  </ng-template>
+  <a *ngIf="link.length < 1" [href]="link" target="_blank">
+    <fa-icon icon="external-link-alt"></fa-icon>
+  </a>
 </div>
 
-<ng-template #tabContent>
-  <img src="assets/img/openaccess.svg" />
-  <span class="fw-bold" i18n="@@openAccess">Avoin saatavuus</span>
-</ng-template>
+
diff --git a/src/app/shared/components/tags/tag-open-access/tag-open-access.component.scss b/src/app/shared/components/tags/tag-open-access/tag-open-access.component.scss
@@ -7,6 +7,12 @@
 
 .open-access {
   border: 2px solid #ea883e;
+  max-width: 152px;
+  max-height: 29px;
+  .svg-inline--fa {
+    max-height: 14.8px !important;
+    max-width: 14px !important;
+  }
 }
 
 a {
@@ -17,4 +23,6 @@ img {
   height: 1rem;
   width: auto;
   margin-right: 0.5rem;
-}
+  max-width: 10.2px !important;
+  max-height: 16px !important;
+}
diff --git a/src/app/shared/components/tags/tag-peer-reviewed/tag-peer-reviewed.component.scss b/src/app/shared/components/tags/tag-peer-reviewed/tag-peer-reviewed.component.scss
@@ -2,4 +2,5 @@
   background: #00a19a;
   border: 2px solid #00a19a;
   color: white;
+  max-width: 114px;
 }
diff --git a/src/migration-mdc.scss b/src/migration-mdc.scss
@@ -8,13 +8,42 @@
   max-width: 42px !important;
 }
 
+.svg-inline--fa.fa-chart-bar {
+  max-height: 16px !important;
+  max-width: 16px !important;
+}
+.open-access, .tag-content {
+  overflow: hidden;
+  .svg-inline--fa {
+    max-height: 14.8px !important;
+    max-width: 14px !important;
+  }
+}
+
+.tag-content {
+  a {
+    display: block;
+    max-height: 26.8px;
+  }
+
+  max-height: 26.8px;
+}
+
 .info-icon {
   .svg-inline--fa {
     max-height: 16px !important;
     max-width: 16px !important;
   }
 }
 
+.login-snackbar .info-icon {
+  .svg-inline--fa {
+    max-height: 42px !important;
+    max-width: 42px !important;
+  }
+}
+
+
 // Filters
 mat-list-option {
   overflow-x: unset !important;