From d4536c6d8602a198d8aa1c16f296390e452208fd Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Tue, 25 Feb 2020 19:05:11 -0500 Subject: [PATCH 1/8] initial --- package-lock.json | 38 +--- src/app/app-routing.module.ts | 7 + src/app/home-alt/_styles.scss | 169 ++++++++++++++++ src/app/home-alt/home-alt.component.html | 210 ++++++++++++++++++++ src/app/home-alt/home-alt.component.spec.ts | 25 +++ src/app/home-alt/home-alt.component.ts | 38 ++++ src/app/home-alt/home-alt.module.spec.ts | 13 ++ src/app/home-alt/home-alt.module.ts | 17 ++ src/app/home-alt/home-routing.module.ts | 16 ++ src/app/home/home.component.html | 14 +- 10 files changed, 507 insertions(+), 40 deletions(-) create mode 100644 src/app/home-alt/_styles.scss create mode 100644 src/app/home-alt/home-alt.component.html create mode 100644 src/app/home-alt/home-alt.component.spec.ts create mode 100644 src/app/home-alt/home-alt.component.ts create mode 100644 src/app/home-alt/home-alt.module.spec.ts create mode 100644 src/app/home-alt/home-alt.module.ts create mode 100644 src/app/home-alt/home-routing.module.ts diff --git a/package-lock.json b/package-lock.json index f688a4dd..b1bc4330 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2705,7 +2705,6 @@ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, - "optional": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -4744,8 +4743,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "constants-browserify": { "version": "1.0.0", @@ -5364,8 +5362,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true, - "optional": true + "dev": true }, "depd": { "version": "1.1.2", @@ -7401,7 +7398,6 @@ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz", "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==", "dev": true, - "optional": true, "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -7451,7 +7447,6 @@ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, - "optional": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -7488,8 +7483,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true, - "optional": true + "dev": true }, "get-stream": { "version": "4.1.0", @@ -7803,8 +7797,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true, - "optional": true + "dev": true }, "has-value": { "version": "1.0.0", @@ -10300,8 +10293,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true, - "optional": true + "dev": true }, "map-visit": { "version": "1.0.0", @@ -11184,7 +11176,6 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, - "optional": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -11250,14 +11241,12 @@ "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "optional": true + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, "braces": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -11275,7 +11264,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -11448,7 +11436,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -11460,7 +11447,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -11520,8 +11506,7 @@ "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "optional": true + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" }, "is-glob": { "version": "4.0.1", @@ -11536,7 +11521,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -11545,7 +11529,6 @@ "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -11555,14 +11538,12 @@ "isobject": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "optional": true + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" }, "kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", - "optional": true + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" }, "micromatch": { "version": "3.1.10", @@ -18517,7 +18498,6 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, - "optional": true, "requires": { "string-width": "^1.0.2 || 2" } diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 375ecce6..f07dfddc 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -23,6 +23,13 @@ const routes: Routes = [ id: "home" } }, + { + path: 'alt', + loadChildren: './home-alt/home-alt.module#HomeAltModule', + data: { + id: "homealt" + } + }, { path: 'workspace', loadChildren: './workspace/workspace.module#WorkspaceModule', diff --git a/src/app/home-alt/_styles.scss b/src/app/home-alt/_styles.scss new file mode 100644 index 00000000..2cd36e08 --- /dev/null +++ b/src/app/home-alt/_styles.scss @@ -0,0 +1,169 @@ +.grid-container { + padding: 0 !important; +} + +.home-top { + background: url("/assets/img/Slice 1.png") no-repeat; + background-size: 100%; + background-position: right bottom; + background-color: #d9ebff; +} + +.home-bottom { + background: url("/assets/img/Slice 2.png") no-repeat; + background-size: 100%; + background-position: right top; + background-color: #8d8563; +} + +.homepage-title { + font-size: 28px; + font-weight: 600; + margin: auto auto 0 32px; +} + +.home-text, +.search-text { + color: white; + border-radius: 5px; + max-width: max-content; + background: rgba(141, 133, 99, 0.5); + padding: 5px; + box-shadow: 1px 1px 15px 1px #8d8563; +} + +.sds-search > select { + width: 25%; +} + +.sds-seal { + box-shadow: -5px 5px 1px 2px white, -5px -5px 1px 2px white, 5px 5px 1px 2px white, 5px -5px 1px 2px white; + border-right: 0 !important; +} + +.sds-tile--lg { + .sds-tile__content { + width: 100% !important; + display: flex !important; + flex-direction: column !important; + justify-content: center !important; + + .sds-tile__icon { + margin: auto 15px !important; + width: auto !important; + } + + .mobile-details { + display: flex !important; + justify-content: center !important; + flex-wrap: wrap !important; + + .sds-button--icon { + margin: auto 10px 10px 10px !important; + } + } + } +} +@media only screen and (max-width: 600px) { + .home-top { + background-size: 100%; + background-position: center bottom; + } + + .home-bottom { + background-size: 100%; + background-position: center top; + } + + .homepage-title { + font-size: 1.2rem; + margin: 20px; + text-align: center; + } + + .usa-search.usa-search--small.usa-search--inverse { + background: none !important; + padding: 0 !important; + } + + .sds-search { + padding: 8px; + background-color: white; + } + + .outline-btn { + flex-direction: column !important; + + .sds-button--outline { + align-self: center; + } + } + + .sds-search { + align-self: center; + } + + .home-video { + display: flex; + flex-direction: column-reverse; + + .video-code { + height: 270px !important; + width: 100% !important; + } + } + + .sds-tile__icon { + width: 40px; + } + + .sds-tile__content, + .sds-tile__content.sds-tile--outline { + width: 300px !important; + } +} +@media only screen and (min-width: 600px) { + .sds-tile--lg { + width: 80%; + } + .ouline-btn { + margin-right: 8%; + margin-left: 8%; + } + + .news { + position: relative; + } +} +@media only screen and (max-width: 880px) { + .outline-btn { + flex-direction: row; + justify-content: space-between; + } +} +@media only screen and (min-width: 880px) { + .sds-tile { + float: left; + } + + .sds-tile:nth-child(3n+1) { + clear: left; + } + + .outline-btn { + flex-direction: column; + } +} +@media only screen and (max-width: 1200px) { + .tiles { + display: flex; + flex-wrap: wrap; + justify-content: center; + + .sds-tile { + flex: 0 1 25%; + display: flex; + justify-content: center; + } + } +} diff --git a/src/app/home-alt/home-alt.component.html b/src/app/home-alt/home-alt.component.html new file mode 100644 index 00000000..0a1daac8 --- /dev/null +++ b/src/app/home-alt/home-alt.component.html @@ -0,0 +1,210 @@ +
+ +
+
+ +
+
+

SAM.gov is the official U.S. government system for:

+
+
+
+ +
+
Official U.S. Government Website
+
100% Free
+
+
+
+ +
+
+
+ +
+ +
Entity Registration
+
+
+ Register your entity to get started doing business with the federal government. +
+
+ + +
+ +
+
+
+
+ + +
Contract Opportunities
+
(was fbo.gov)
+ +
+
+ + +
Contract Data Reports
+
(was fpds.gov reports)
+ +
+
+ + +
Entity Compliance
+ +
+
+ + +
Assistance Listings
+
(was cfda.gov)
+ +
+
+ + +
Wage Determinations
+
(wdol.gov)
+ +
+
+ + +
Federal Hierarchy
+ +
+
+
+
+ +
+
+

New to SAM.gov?

+
+ +
+
+
+

Already know what you want to find?

+
+
+ + + +
+
+
+
+
+
+ +
+ +
+
+

What's new at SAM.gov?

+
+
+
+
+
+
{{news.publishDate | date}}
+ {{news.title}} +
+
+ {{news.shortDescription}} +
+
+
+
+
+ More News +
+ +
+ +
+
+

Have questions about SAM.gov?

+
+
+
+
+ + + Videso on SAM.gov + + + + Glossary Terms + +
+
+ +
+
+
+ Watch our welcome video +
+
+
+
+

Frequently Asked Questions

+
+ + + Do I need a user account? + + + + What's the difference between signing up and registering? + + + + What is I already have a login.gov account? + + + + What do I need to register my entity? + +
+
+ More FAQs +
+
+
+
+
+
diff --git a/src/app/home-alt/home-alt.component.spec.ts b/src/app/home-alt/home-alt.component.spec.ts new file mode 100644 index 00000000..8a75ee3a --- /dev/null +++ b/src/app/home-alt/home-alt.component.spec.ts @@ -0,0 +1,25 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { HomeComponent } from './home-alt.component'; + +describe('HomeComponent', () => { + let component: HomeComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [ HomeComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(HomeComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/home-alt/home-alt.component.ts b/src/app/home-alt/home-alt.component.ts new file mode 100644 index 00000000..ab721661 --- /dev/null +++ b/src/app/home-alt/home-alt.component.ts @@ -0,0 +1,38 @@ +import { Component, OnInit, AfterViewInit, ViewChild, ElementRef } from '@angular/core'; +import {Router} from '@angular/router'; +import { SamModelService } from '../model/sam-model.service'; + +import { NewsData } from '../news/news-data/news.model'; +import { NewsList } from '../news/news-data/news.data'; + +@Component({ + selector: 'app-home', + templateUrl: './home-alt.component.html', + styleUrls: ['./_styles.scss'] +}) +export class HomeAltComponent implements AfterViewInit, OnInit { + + newsList: NewsData[] = NewsList.sort(this.sortNews).slice(0, 3); + + constructor(private router: Router, public model: SamModelService) { + } + + ngOnInit() { + } + + sortNews(a: NewsData, b: NewsData) { + return(a.publishDate < b.publishDate) ? 1 : -1; + } + + navigateTo(route: string) { + this.router.navigateByUrl(route); + } + + ngAfterViewInit() + { + } + + log(value) { + console.log(`%cLog: ${value}`, 'color: blue; font-weight: bold'); + } +} diff --git a/src/app/home-alt/home-alt.module.spec.ts b/src/app/home-alt/home-alt.module.spec.ts new file mode 100644 index 00000000..fafa1c65 --- /dev/null +++ b/src/app/home-alt/home-alt.module.spec.ts @@ -0,0 +1,13 @@ +import { HomeAltModule } from './home-alt.module'; + +describe('HomeAltModule', () => { + let homeAltModule: HomeAltModule; + + beforeEach(() => { + homeAltModule = new HomeAltModule(); + }); + + it('should create an instance', () => { + expect(homeAltModule).toBeTruthy(); + }); +}); diff --git a/src/app/home-alt/home-alt.module.ts b/src/app/home-alt/home-alt.module.ts new file mode 100644 index 00000000..251ef97f --- /dev/null +++ b/src/app/home-alt/home-alt.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; + +import { SdsSubheaderModule } from '@gsa-sam/layouts'; + +import { HomeRoutingModule } from './home-routing.module'; +import { HomeAltComponent } from './home-alt.component'; + +@NgModule({ + imports: [ + CommonModule, + SdsSubheaderModule, + HomeRoutingModule + ], + declarations: [HomeAltComponent] +}) +export class HomeAltModule { } diff --git a/src/app/home-alt/home-routing.module.ts b/src/app/home-alt/home-routing.module.ts new file mode 100644 index 00000000..906036a7 --- /dev/null +++ b/src/app/home-alt/home-routing.module.ts @@ -0,0 +1,16 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; +import { HomeAltComponent } from './home-alt.component'; + +const routes: Routes = [ + { + path: '', + component: HomeAltComponent + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class HomeRoutingModule { } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 0a1daac8..09b5e6f7 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -23,25 +23,17 @@

SAM.gov is the official U.S. governmen
-
Entity Registration
+
Contract Opportunities
- Register your entity to get started doing business with the federal government. -
+ This site is the official source of contracting opportunities from the federal government. Anyone interested in doing business with the government can use this system to research active opportunities.
-
From 0afa97e60788642433ac9d73050791f7dbc4230a Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Wed, 26 Feb 2020 09:56:40 -0500 Subject: [PATCH 2/8] Changes to Homepage --- src/app/home/_styles.scss | 4 ++ src/app/home/home.component.html | 46 +++++++++++----------- src/app/model/sam-model.service.ts | 2 +- src/assets/img/beta_samgov_horizontal.png | Bin 0 -> 28518 bytes 4 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 src/assets/img/beta_samgov_horizontal.png diff --git a/src/app/home/_styles.scss b/src/app/home/_styles.scss index 2cd36e08..7d33f4da 100644 --- a/src/app/home/_styles.scss +++ b/src/app/home/_styles.scss @@ -62,6 +62,10 @@ margin: auto 10px 10px 10px !important; } } + .learn-more-link{ + min-width:100%; + font-weight: 600; + } } } @media only screen and (max-width: 600px) { diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 09b5e6f7..700af877 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -25,8 +25,10 @@

SAM.gov is the official U.S. governmen
Contract Opportunities
-
- This site is the official source of contracting opportunities from the federal government. Anyone interested in doing business with the government can use this system to research active opportunities.
+
+ This site is the official source of contracting opportunities from the federal government. Anyone + interested in doing business with the government can use this system to research active opportunities. +
+
+
Learn More
+
+
-
- - -
Contract Opportunities
-
(was fbo.gov)
- -
+
@@ -54,12 +54,6 @@

SAM.gov is the official U.S. governmen
(was fpds.gov reports)

-
- - -
Entity Compliance
- -
@@ -86,7 +80,7 @@

SAM.gov is the official U.S. governmen
-

New to SAM.gov?

+

New to beta.SAM.gov?

@@ -124,9 +119,11 @@

Already know what you want to f
-
+
-

What's new at SAM.gov?

+

What's + new at beta.SAM.gov?

@@ -147,16 +144,18 @@

-
+
-

Have questions about SAM.gov?

+

Have + questions about beta.SAM.gov?

- Videso on SAM.gov + Videos on beta.SAM.gov @@ -166,7 +165,8 @@

-
+
Watch our welcome video
diff --git a/src/app/model/sam-model.service.ts b/src/app/model/sam-model.service.ts index f35651cd..4de77c1c 100644 --- a/src/app/model/sam-model.service.ts +++ b/src/app/model/sam-model.service.ts @@ -56,7 +56,7 @@ export class SamModelService { ], home: { text: 'Home', - logo: this.locationStrategy.getBaseHref() + 'assets/img/logo-sam.svg', + logo: this.locationStrategy.getBaseHref() + 'assets/img/beta_samgov_horizontal.png', route: '/', id: 'home', mode: NavigationMode.INTERNAL, diff --git a/src/assets/img/beta_samgov_horizontal.png b/src/assets/img/beta_samgov_horizontal.png new file mode 100644 index 0000000000000000000000000000000000000000..644561044667dfd2c2913dc0a9ea22b9016b7ec3 GIT binary patch literal 28518 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 XKK0U1`YK}R-xsPXX(?7cw+#D#Es;*p literal 0 HcmV?d00001 From 9ea25e80ad2848937d5ae7bac2009de37ed66b98 Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Fri, 28 Feb 2020 09:35:06 -0500 Subject: [PATCH 3/8] Added 2 column clustering and SVG logo --- src/app/home/_styles.scss | 2 +- src/app/model/sam-model.service.ts | 2 +- src/assets/img/beta_samgov_horizontal.svg | 139 ++++++++++++++++++++++ 3 files changed, 141 insertions(+), 2 deletions(-) create mode 100644 src/assets/img/beta_samgov_horizontal.svg diff --git a/src/app/home/_styles.scss b/src/app/home/_styles.scss index 7d33f4da..fb23856b 100644 --- a/src/app/home/_styles.scss +++ b/src/app/home/_styles.scss @@ -150,7 +150,7 @@ float: left; } - .sds-tile:nth-child(3n+1) { + .sds-tile:nth-child(2n+1) { clear: left; } diff --git a/src/app/model/sam-model.service.ts b/src/app/model/sam-model.service.ts index 4de77c1c..1328fba1 100644 --- a/src/app/model/sam-model.service.ts +++ b/src/app/model/sam-model.service.ts @@ -56,7 +56,7 @@ export class SamModelService { ], home: { text: 'Home', - logo: this.locationStrategy.getBaseHref() + 'assets/img/beta_samgov_horizontal.png', + logo: this.locationStrategy.getBaseHref() + 'assets/img/beta_samgov_horizontal.svg', route: '/', id: 'home', mode: NavigationMode.INTERNAL, diff --git a/src/assets/img/beta_samgov_horizontal.svg b/src/assets/img/beta_samgov_horizontal.svg new file mode 100644 index 00000000..2cc4f057 --- /dev/null +++ b/src/assets/img/beta_samgov_horizontal.svg @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d993e9040e4fc55dbe5cac5cc36ba7fef2fa1564 Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Mon, 2 Mar 2020 15:22:51 -0500 Subject: [PATCH 4/8] added link to "alt" version and new tile arrangement for tablet --- src/app/app.component.html | 1 + src/app/home/_styles.scss | 27 +++++++++++++++++++++++---- src/app/home/home.component.html | 22 +++++++++++++++------- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index 9aef3dec..cdada8df 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,6 +1,7 @@

diff --git a/src/app/home/_styles.scss b/src/app/home/_styles.scss index fb23856b..247a22fa 100644 --- a/src/app/home/_styles.scss +++ b/src/app/home/_styles.scss @@ -62,8 +62,8 @@ margin: auto 10px 10px 10px !important; } } - .learn-more-link{ - min-width:100%; + .learn-more-link { + min-width: 100%; font-weight: 600; } } @@ -150,7 +150,7 @@ float: left; } - .sds-tile:nth-child(2n+1) { + .sds-tile:nth-child(2n + 1) { clear: left; } @@ -159,15 +159,34 @@ } } @media only screen and (max-width: 1200px) { + .sds-tile__content { + display: flex; + flex-direction: row; + text-align: left; + } .tiles { display: flex; flex-wrap: wrap; justify-content: center; .sds-tile { - flex: 0 1 25%; + flex: 0 1 31%; display: flex; justify-content: center; } } } +@media only screen and (max-width: 1200px) { + .tiles .sds-tile__content.sds-tile--outline { + height: 80px; + width: 250px; + } +} +@media only screen and (max-width: 600px) { + .tiles .sds-tile__content.sds-tile--outline { + height: auto; + } + .sds-tile__text { + padding: 0.4em 0px; + } +} diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 700af877..a10f8664 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -50,28 +50,36 @@

SAM.gov is the official U.S. governmen
-
Contract Data Reports
-
(was fpds.gov reports)
+
+
Contract Data Reports
+
(was fpds.gov reports)
+
-
Assistance Listings
-
(was cfda.gov)
+
+
Assistance Listings
+
(was cfda.gov)
+
-
Wage Determinations
-
(wdol.gov)
+
+
Wage Determinations
+
(wdol.gov)
+
-
Federal Hierarchy
+
+
Federal Hierarchy
+

This Website is a prototype intended to support usability testing only. + future
From 0e1ec279836ac5d8939854688278062713c03942 Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Tue, 31 Mar 2020 13:35:26 -0400 Subject: [PATCH 5/8] Incorporated feedback Tiles are now responsive below desktop breakpoint --- src/app/app.component.html | 2 +- src/app/home/_styles.scss | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/app.component.html b/src/app/app.component.html index cdada8df..6fcdb7e4 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,7 +1,7 @@
This Website is a prototype intended to support usability testing only. - future + future
diff --git a/src/app/home/_styles.scss b/src/app/home/_styles.scss index 247a22fa..b03ea441 100644 --- a/src/app/home/_styles.scss +++ b/src/app/home/_styles.scss @@ -163,6 +163,8 @@ display: flex; flex-direction: row; text-align: left; + align-items: center; + } .tiles { display: flex; @@ -170,7 +172,7 @@ justify-content: center; .sds-tile { - flex: 0 1 31%; + flex: 0 1 40%; display: flex; justify-content: center; } @@ -178,8 +180,8 @@ } @media only screen and (max-width: 1200px) { .tiles .sds-tile__content.sds-tile--outline { - height: 80px; - width: 250px; + // height: 80px; + width: 100%; } } @media only screen and (max-width: 600px) { @@ -190,3 +192,6 @@ padding: 0.4em 0px; } } +.sds-tile__text { + flex-basis: 75%; +} From 3e2e29526da105c8b1dca0e06c3860479048a672 Mon Sep 17 00:00:00 2001 From: Alejandro Colina Date: Wed, 1 Apr 2020 09:15:22 -0400 Subject: [PATCH 6/8] Incorporate feedback Update Homepage --- src/app/home-alt/home-alt.component.html | 47 +++++++++++++++--------- src/app/home/home.component.html | 20 ++++------ 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/src/app/home-alt/home-alt.component.html b/src/app/home-alt/home-alt.component.html index 0a1daac8..2b224d01 100644 --- a/src/app/home-alt/home-alt.component.html +++ b/src/app/home-alt/home-alt.component.html @@ -2,12 +2,13 @@
+
-
-
+
+

SAM.gov is the official U.S. government system for:

-
+
@@ -16,19 +17,20 @@

SAM.gov is the official U.S. governmen

+
-
+
Entity Registration
-
+
Register your entity to get started doing business with the federal government.
-
+
+
@@ -55,33 +58,38 @@

SAM.gov is the official U.S. governmen
(was fbo.gov)

+
-
Contract Data Reports
-
(was fpds.gov reports)
+
Contract Data
+
(only reports from FPDS)
+
- +
Entity Compliance
+
- +
Assistance Listings
(was cfda.gov)
+
Wage Determinations
-
(wdol.gov)
+
(was wdol.gov)
+
@@ -90,7 +98,7 @@

SAM.gov is the official U.S. governmen

-
+
@@ -105,16 +113,19 @@

New to SAM.gov?

-
+

Already know what you want to find?