Merge pull request #4106 from cisagov/gallery-enhance

added image space to gallery items
cisagov · Sep 23, 2024 · f681645 · f681645
2 parents 57de9ca + 51db362
commit f681645
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 4 deletions.
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_Api.sln.DotSettings.user b/CSETWebApi/CSETWeb_Api/CSETWeb_Api.sln.DotSettings.user
@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIPEndPoint_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4215f2f52d7b4c4cbb3e04c9c67fb2143bc00_003F3c_003F420cdc07_003FIPEndPoint_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Parameters/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Method/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/AutoDetectedNamingRules/=Locals/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>

diff --git a/CSETWebNg/src/app/initial/new-assessment/new-assessment.component.html b/CSETWebNg/src/app/initial/new-assessment/new-assessment.component.html
@@ -36,6 +36,9 @@ <h4>{{row.group_Title}}</h4>
                     <div class="card-body gallery-card-body cursor-pointer"
                         style="min-height:150px; max-height:150px; z-index:1"
                         (click)="navSvc.beginNewAssessmentGallery(c)">
+                        <div class="img-container">
+                            <img class="img-cropped-calc" [src]="getImageSrc(c.icon_File_Name_Small)">
+                        </div>
                         <h6 class="card-title" ellipsis [ellipsis-content]="c.title"
                             style="max-height:80px; min-height:80px; font-weight:bold;"></h6>
 

diff --git a/CSETWebNg/src/app/initial/new-assessment/new-assessment.component.scss b/CSETWebNg/src/app/initial/new-assessment/new-assessment.component.scss
@@ -52,4 +52,13 @@ SOFTWARE.
 .swiper-button-prev.swiper-button-disabled,
 .swiper-button-next.swiper-button-disabled {
   opacity: 0;
-}
+}
+
+.img-container{
+  position: relative;
+    width: 100%;
+    height: 70px;
+    overflow: hidden;
+    border-bottom: 1px solid rgba(54, 113, 144, .2)
+}
+
diff --git a/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss b/CSETWebNg/src/app/layout/layout-main/layout-main.component.scss
@@ -3884,12 +3884,12 @@ h6.dropdown-header {
 }
 
 .gallery-card-body {
-  padding: 1rem 1rem 0 1rem !important;
+  padding: 0 !important;
 }
 
 .gallery-card-body h6 {
   margin-bottom: 0 !important;
-  padding-bottom: 0 !important;
+  padding: 1rem 1rem 0 1rem !important;
 }
 
 .gallery-card-body-buttons {
@@ -3982,7 +3982,19 @@ h6.dropdown-header {
 
 .gallery-card:hover {
   border: 1px solid #ffc107;
-
+}
+
+.img-cropped-calc {
+  position: absolute;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  opacity:20%;
+}
+
+.gallery-card:hover .img-cropped-calc {
+  opacity:70% !important;
 }
 
 .gallery-card-footer {