Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/ecasogp 9702 #421

Open
wants to merge 52 commits into
base: development
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
fcd2102
added resources page
HarikaMunipalle Apr 20, 2023
43de1f6
Merge pull request #373 from GSA/feature/ECASOGP-9267-adding-json-links
luna-fed-developer Apr 20, 2023
d8b3f78
fixed or logic in functionality
HarikaMunipalle Apr 20, 2023
09d0c1b
added qsmo condition to avoid unnecessary icons in url
HarikaMunipalle Apr 20, 2023
9b41710
added Reset button click
HarikaMunipalle Apr 21, 2023
6ffca62
added aria-label fixed ANDI issue
HarikaMunipalle Apr 21, 2023
e71d00d
changed yaml to json
HarikaMunipalle Apr 21, 2023
d41cbf1
added marketplace
HarikaMunipalle Apr 24, 2023
d4cfb1d
added marketplace1
HarikaMunipalle Apr 24, 2023
a862cc2
fixed comments
HarikaMunipalle Apr 24, 2023
ac3cd17
.
HarikaMunipalle Apr 24, 2023
b7e2185
Merge pull request #372 from GSA/feature/ECASOGP-9277
HarikaMunipalle Apr 25, 2023
617e4f8
Merge pull request #376 from GSA/master
alexdntowe Apr 27, 2023
0acf119
Merge remote-tracking branch 'origin/feature/ECASOGP-9277' into featu…
alexdntowe May 1, 2023
e8d3b75
fixed issues
HarikaMunipalle May 1, 2023
c9159b1
Sub Page Initial dev
alexdntowe May 1, 2023
daab4c4
Merge pull request #379 from GSA/feature/ECASOGP-9277
HarikaMunipalle May 1, 2023
3c7aa6d
Merge branch 'feature/ECASOGP-9292-catalog-subpage' into test
HarikaMunipalle May 2, 2023
c38440e
Merge pull request #380 from GSA/test
HarikaMunipalle May 3, 2023
e1ec794
first commit
HarikaMunipalle May 3, 2023
bb121d8
added images
HarikaMunipalle May 3, 2023
80f788a
removed 2 filter types
HarikaMunipalle May 5, 2023
f9a17f9
added link for title
HarikaMunipalle May 5, 2023
3270c77
Merge branch 'master' into test
luna-fed-developer May 22, 2023
a27b28d
Merge pull request #384 from GSA/feature/ECASOGP-9631-marketplace-update
luna-fed-developer May 22, 2023
64b4e59
Merge pull request #385 from GSA/feature/ECASOGP-9631-marketplace-update
luna-fed-developer May 23, 2023
8af1e1c
Merge pull request #386 from GSA/feature/ECASOGP-9631-marketplace-update
luna-fed-developer May 23, 2023
1dfb16d
new json
HarikaMunipalle Jun 5, 2023
b9f3865
.
HarikaMunipalle Jun 5, 2023
8bfe58c
.
HarikaMunipalle Jun 5, 2023
2786e0c
.
HarikaMunipalle Jun 5, 2023
dfe4cba
.
HarikaMunipalle Jun 5, 2023
2205bd5
.
HarikaMunipalle Jun 5, 2023
6da8039
.
HarikaMunipalle Jun 5, 2023
b136bc4
.
HarikaMunipalle Jun 5, 2023
0e95477
.
HarikaMunipalle Jun 5, 2023
6429be6
added services
HarikaMunipalle Jun 6, 2023
a957a4a
.
HarikaMunipalle Jun 6, 2023
8468e2c
.
HarikaMunipalle Jun 6, 2023
66d6425
.
HarikaMunipalle Jun 6, 2023
dc0e830
..
HarikaMunipalle Jun 6, 2023
a923d54
Merge pull request #381 from GSA/feature/ECASOGP-9292-catalog-subpage
HarikaMunipalle Jun 6, 2023
cd04624
Merge pull request #391 from GSA/feature/ECASOGP-9292-catalog-subpage
HarikaMunipalle Jun 12, 2023
1cedd83
.
HarikaMunipalle Jun 12, 2023
1a7586b
..
HarikaMunipalle Jun 12, 2023
2a64c45
Merge pull request #392 from GSA/feature/ECASOGP-9292-catalog-subpage
HarikaMunipalle Jun 12, 2023
0f6f821
.
HarikaMunipalle Jun 23, 2023
4ee0cb6
Merge pull request #393 from GSA/feature/ECASOGP-9292-catalog-subpage
HarikaMunipalle Jun 23, 2023
44d52e2
Merge branch 'test' into Update-test
alexdntowe Jun 27, 2023
c3ee816
Merge pull request #397 from GSA/Update-test
alexdntowe Jun 27, 2023
54bbf3a
ECASOGP-9702: Catalog page implementation based on real data
istankevychgsa Aug 3, 2023
5d2d99b
Update image on catalog subpage
istankevychgsa Aug 4, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ <h2>Ooops! The page you’re looking for does not seem to be available.</h2>
<p>If you would like to try again, below are suggestions that will take you to the primary categories of our site:</p>

<div class="grid-row grid-gap" style="justify-content: center; font-weight: bold;">
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/governance/">Governance</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/fibf/">Business Standards</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/qsmo/">QSMO</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/m3/">M3 Framework</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/about/">About OSSPI</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/marketplace1/">MarketPlace</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/governance/">Governance</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/fibf/">Business Standards</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/qsmo/">QSMO</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/m3/">M3 Framework</a></div>
<div class="tablet:grid-col-auto"><a href="https://ussm.gsa.gov/about/">About OSSPI</a></div>
</div>
<h3 style="color: black;">We check our sites regularly for broken links; however, you may find one before we get to it. If that happens, please send us a note at <a href="mailto:[email protected]">[email protected]</a> and we’ll get right on it to correct the problem! Thank You!</h3>
</div>
Expand Down
6 changes: 5 additions & 1 deletion _assets/css/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@import "m3-keyTask";
@import "m3-homepage";
@import "business-standards";

@import "./resources.scss";
@import "marketplace";

/* Example - Override the background image in the hero component using CSS:
Expand All @@ -32,6 +32,10 @@
/*
Add your SASS/CSS here
*/

.ogp-top-line{
border-top: 1px solid #adadad;
}
/* default mode hide banner */
.usa-banner__content {
display: hidden;
Expand Down
182 changes: 182 additions & 0 deletions _assets/css/resources.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,182 @@
/****************************styling for resource catalog******************************/
.no-style {
text-decoration: none;
color: black;
}
.anchor-fill{
width: inherit;
display: block;
height: 70%;
margin-left: 0.2rem;
margin-right: 0.2rem;
}

.grid-spacing {
padding: 0;
margin-top: 10px;
margin-bottom: 10px;
padding: 0px 10px 0px 0px;

}

.filters ul {
display: flex;
flex-wrap: wrap;
margin: 0;
padding: 0;
list-style-type: none;
}

.filters li {
margin: 0 2px 2px 0;
}

.big {
font-size: 20px;
}

.filters a {
display: block;
padding: .5em 1em;
font-size: 80%;
border: solid 1px hsl(0, 0%, 50%);
color: #333;
text-decoration: none;
background: white;
}

.text-container {
height: 10rem;
overflow:hidden;
}

.filters a:hover {
outline: 2px solid hsl(0, 0%, 50%);
}

a.checked {
background: #595959;
color: white;
}

.fibf-fm-border {
border-top: solid 4px #000BA5;
}

.fibf-gm-border {
border-top: solid 4px #2A4B45;
}

.fibf-cyb-border {
border-top: solid 4px #AC0606;
}

.fibf-hr-border {
border-top: solid 4px #A3007A;
}

.fibf-pc-border{
border-top: solid 4px #000000;
}

.fibf-flt-border {
border-top: solid 4px #854200;
}

.fibf-erm-border {
border-top: solid 4px #6B6B6B;
}

.title-resources {
font-size: 14.2px;
line-height: 20px;
font-weight: 500;
margin-left: 2px;
}

//star icon for new resources
.new-resource-icon {
position:absolute;
top: 7px;
right: 12px;
max-width: 15%;
}

h21{
color: #2A4B45;
}

.shadow-1 {
padding: 15px;
}

.buttonsRow{
width: 100%;
margin: 0;
padding: 0;
}

.button-wrapper{
display: block;
margin: 0;
padding: 5px 0;
width: 100%;
}
.full-width{
width: 100%;
}

.itm-tag {
font-size: .9rem;
margin-top: .2em;
margin-bottom: .15em;
font-weight: 700;
letter-spacing: 0.5px;
color: #323a45;
}

.fa-external-link-alt{
font-size: 10px;
color: #3ea0db;
}

.filter-list {
a {
&.is-checked {
background: #595959;
color: white;
}
}
}

.color-white{
color:white;
}

.heading {
background-image: url('../assets/images/homepage-update-image-2.png');
background-repeat: no-repeat;
}



@media screen and (min-width: 64em) {
.usa-header--basic .usa-navbar {
width: 27% !important;
}
}

.card-tag {
font-size: .9rem;
margin-top: .2em;
margin-bottom: .15em;
margin-left: 0.3rem;
font-weight: 700;
letter-spacing: 0.5px;
color: #323a45;
}

.image {
height:100px;
border-radius:50%;
}
11 changes: 11 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ ga:

# Site Navigation
primary_navigation:
- text: 'MarketPlace'
href: pages/team.md
permalink: /marketplace1/
show_in_menu: true
show_in_footer: false
- text: 'Governance'
href: pages/team.md
permalink: /governance/
Expand Down Expand Up @@ -420,6 +425,12 @@ page_gen:
index_files: true # true
name_expr: "record['type']"
title: "record['type']"
- data: "resource-data"
template: "sub-page-resource"
dir: "/marketplace1/"
name_expr: "record['PartnerID']"
title: "record['PartnerID']"
index_files: true



Expand Down
Loading