Skip to content

Commit be9abe4

Browse files
chuanlin2018chuanlin2018
committed
Updated NIST logo;Fixed filter's clearAll function
1 parent b4900e6 commit be9abe4

9 files changed

Lines changed: 109 additions & 51 deletions

File tree

‎angular/angular.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020
"tsConfig": "src/tsconfig.app.json",
2121
"assets": ["src/favicon.ico", "src/assets"],
2222
"styles": [
23-
"src/styles/main.css",
2423
"src/styles/font-awesome/css/font-awesome.min.css",
2524
"node_modules/primeicons/primeicons.css",
2625
"node_modules/primeng/resources/themes/lara-dark-blue/theme.css",
2726
"node_modules/primeng/resources/primeng.min.css",
28-
"node_modules/primeflex/primeflex.css"
27+
"node_modules/primeflex/primeflex.css",
28+
"src/styles.css"
2929
],
3030
"scripts": ["node_modules/primeui/primeui-ng-all.min.js"],
3131
"allowedCommonJsDependencies": ["lodash"],

‎angular/src/app/frame/footbar/footbar.component.css‎

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,23 @@
66
}
77

88
.footer__inner {
9-
padding-left:20px;
10-
padding-top:20px;
11-
padding-right:20px;
9+
padding-left:2em;
10+
padding-right:2em;
1211
padding-bottom:10px;
1312

1413
}
1514

1615
#footer .footer__logo img {
17-
width: 240px;
18-
margin-left: 1.2em;
16+
width: 386px;
17+
margin-top: -1em;
18+
margin-left: -20px;
19+
}
20+
21+
.footer__logo {
22+
width: 400px;
23+
height: 70px;
24+
padding-top: .5em;
25+
overflow: hidden;
1926
}
2027

2128
field-items img
@@ -329,3 +336,24 @@ display: block;
329336
-webkit-margin-end: 0px;
330337
-webkit-padding-start: 40px;
331338
}
339+
340+
.nist-social--x-white {
341+
width: 16px;
342+
height: 16px;
343+
/* margin-right: .5em; */
344+
margin-top: 14px;
345+
margin-left: 12px;
346+
cursor: pointer;
347+
vertical-align: bottom;
348+
}
349+
350+
.x-icon {
351+
display:inline-block;
352+
width: 40px;
353+
height: 40px;
354+
margin-top: -10px;
355+
vertical-align: middle;
356+
}
357+
.x-icon:hover {
358+
background-color: lightgray;
359+
}

‎angular/src/app/frame/footbar/footbar.component.html‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,31 @@
44
<div class="social-links" *ngIf="socialMediaList">
55
<div class="item-list">
66
<ul>
7-
<li *ngFor="let socialMedia of socialMediaList">
8-
<a [href]="socialMedia.url" target="_blank" rel="noopener noreferrer" class="social-btn social-btn--large extlink ext"><i [class]="socialMedia.icon"><span
9-
class="element-invisible">{{socialMedia.name}}</span></i><span class="ext"><span class="element-invisible"> (link
10-
is external)</span></span></a>
11-
</li>
7+
<li *ngFor="let socialMedia of socialMediaList; let i = index">
8+
<div *ngIf="i==1" class="x-icon">
9+
<a href=" https://x.com/NIST" target="_blank">
10+
<div
11+
class="nist-social nist-social--x-white"
12+
style="background-image:url(/assets/images/x_white.svg)">
13+
</div>
14+
</a>
15+
</div>
16+
17+
<a *ngIf="i>1" [href]="socialMedia.url" target="_blank" rel="noopener noreferrer" class="social-btn social-btn--large extlink ext"><i [class]="socialMedia.icon"><span
18+
class="element-invisible">{{socialMedia.name}}</span></i><span class="ext"><span class="element-invisible"> (link
19+
is external)</span></span></a>
20+
</li>
1221
</ul>
1322
</div>
1423
</div>
1524

16-
<!-- Footer logo -->
1725
<div class="footer__logo">
18-
<a href="https://www.nist.gov" target="_blank" rel="noopener" title="National Institute of Standards and Technology" class="footer__logo-link" rel="home">
19-
<img src="./assets/images/logo_rev.png" alt="National Institute of Standards and Technology" title="National Institute of Standards and Technology">
20-
</a>
21-
</div>
22-
26+
<a href="https://nist.gov/" target="_blank" title="National Institute of Standards and Technology"
27+
class="footer__logo-link" rel="home noopener">
28+
<img src="./assets/images/f_nist-logo-brand-white_nist-logo-brand-white.png" alt="National Institute of Standards and Technology"
29+
title="National Institute of Standards and Technology">
30+
</a>
31+
</div>
2332

2433
<!-- Footer links line #1 -->
2534
<div id="block-menu-menu-footer-menu" *ngIf="footerLinks01"

‎angular/src/app/frame/headbar/headbar.component.css‎

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
display: flex;
44
align-items: center;
55
background-color: #000000;
6-
margin-left: 10px;
6+
margin-left: 2em;
77
cursor: pointer;
88
}
99

@@ -14,6 +14,7 @@
1414
font-size: 12px;
1515
white-space: nowrap;
1616
margin-right: -10px;
17+
display:inline-block;
1718
}
1819

1920
::ng-deep .p-menubar {
@@ -78,3 +79,39 @@
7879
margin-left: auto;
7980
}
8081

82+
.logo-container {
83+
display:inline-block;
84+
width: 110px; /* Width of the container */
85+
height: 30px; /* Height of the container */
86+
overflow: hidden;
87+
margin-right: 5px;
88+
}
89+
90+
.image-container {
91+
width: 330px; /* Width of the container */
92+
height: 100px; /* Height of the container */
93+
overflow: hidden;
94+
position: relative;
95+
margin-left: -60px;
96+
margin-top: -2em;
97+
}
98+
99+
.scaled-image {
100+
width: 100%;
101+
height: 100%;
102+
object-fit: cover; /* Ensures the image scales to cover the container */
103+
object-position: left center; /* Ensures the left part of the image is in view */
104+
transform: scale(.8); /* Scale the image */
105+
clip-path: inset(0 10% 0 0); /* Clips the right half, showing only the left */
106+
transition: transform 0.3s ease-in-out; /* Smooth transition for scale */
107+
}
108+
109+
#appVersion {
110+
display:inline-block;
111+
border: 1px solid #f0f0f0;
112+
margin-left: 2em;
113+
/* margin-top: 5px; */
114+
margin-right: 18px;
115+
color: #f0f0f0;
116+
background-color: transparent;
117+
}

‎angular/src/app/frame/headbar/headbar.component.html‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,22 @@
55
(click)="goHome()"
66
style="display: flex; align-items: center; margin-right: 10px"
77
>
8-
<img
9-
src="./assets/images/nist_logo_reverse.png"
10-
alt="NIST Science Data Portal"
11-
title="NIST Science Data Portal"
12-
/>
8+
<div class="logo-container">
9+
<div class="image-container">
10+
<img src="assets/images/f_nist-logo-brand-white_nist-logo-brand-white.png" alt="Your Image" class="scaled-image" />
11+
</div>
12+
</div>
13+
1314
<div class="logo-text">
1415
<div class="ml-2">SCIENCE</div>
1516
<div class="ml-2">DATA PORTAL</div>
1617
</div>
1718

1819
<span
19-
class="tag"
20+
class="tag" id="appVersion"
2021
[ngClass]="{ 'p-tag': true, 'p-tag-contrast': true }"
21-
style="margin-left: 1em; margin-top: -15px"
22-
>
23-
{{ appVersion }}</span
2422
>
23+
{{ appVersion }}</span>
2524
</div>
2625
</ng-template>
2726
</p-menubar>

‎angular/src/app/search/filters/filters.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
class="btn-sm collapsed in"
2020
(click)="setFilterWidth()"
2121
data-toggle="collapse"
22-
style="border-color: #025277; color: #fff; padding: 0em; border: 0em"
22+
style="border-color: #025277; color: #fff; padding: 0em; border: 0em; cursor: pointer"
2323
data-target="#demo"
2424
><span *ngIf="filterWidthNum > 170">Filters </span
2525
><i

‎angular/src/app/search/filters/filters.component.ts‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -748,28 +748,12 @@ export class FiltersComponent implements OnInit, AfterViewInit {
748748
this.collectComponentsWithCount();
749749
this.collectThemes(this.searchResults);
750750
this.collectThemesWithCount();
751-
this.themesTree = [
752-
{
753-
label: "NIST Research Topics -",
754-
expanded: true,
755-
children: this.themesWithCount
756-
},
757-
];
758-
this.componentsTree = [
759-
{
760-
label: "Record has -",
761-
expanded: true,
762-
children: this.componentsWithCount,
763-
},
764-
];
765-
766-
this.resourceTypeTree = [
767-
{
768-
label: "Resource Type -",
769-
expanded: true,
770-
children: this.resourceTypesWithCount,
771-
},
772-
];
751+
this.themesTree["expanded"] = true;
752+
this.themesTree["children"] = this.themesWithCount;
753+
this.componentsTree["expanded"] = true;
754+
this.componentsTree["children"] = this.componentsWithCount;
755+
this.resourceTypeTree["expanded"] = true;
756+
this.resourceTypeTree["children"] = this.resourceTypesWithCount;
773757

774758
this.filterResults();
775759
}

‎angular/src/assets/images/f_nist-logo-brand-white_nist-logo-brand-white.png‎

19 KB
Loading

‎angular/src/assets/images/x_white.svg‎

Lines changed: 1 addition & 0 deletions
Loading

0 commit comments

Comments
 (0)