Skip to content

Commit b2a5b5a

Browse files
DinneKDinneK
authored
Merge pull request #297 from DSACMS/Fix-nav-menu
Fix nav menu
2 parents 05cd910 + 8d209a7 commit b2a5b5a

7 files changed

Lines changed: 340 additions & 111 deletions

File tree

‎app/site/_includes/nav.liquid‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<div class="usa-navigation-container">
44
<div class="usa-nav-bar">
55
<div class="title">
6-
<img src="{{ "/assets/img/cms-logo.jpg" | url }}" class="logo">
6+
<img src="{{ "/assets/img/cms-logo.jpg" | url }}" class="logo" alt="CMS Logo">
77
<h1>Metrics Website</h1>
88
</div>
99
<div class="usa-logo">
@@ -12,17 +12,17 @@
1212
</em>
1313
</div>
1414
</div>
15-
<nav aria-label="Primary navigation" class="usa-nav">
15+
<nav aria-label="Primary navigation" class="usa-nav nav-styling">
1616
<button type="button" class="usa-nav__close">
17-
<svg class="usa-icon--size-7" aria-hidden="true" focusable="false" role="img">
17+
<svg class="usa-icon--size-7 button-styling" aria-hidden="true" focusable="false" role="img">
1818
<use href="{{ site.baseurl }}/assets/img/sprite.svg#close"></use>
1919
</svg>
2020
</button>
21-
<ul class="usa-nav__primary usa-accordion">
21+
<ul class="usa-nav__primary usa-accordion usa-nav__primary-navigation">
2222
<li class="usa-nav__primary-item">
2323
<button
2424
type="button"
25-
class="usa-accordion__button usa-nav__link"
25+
class="usa-accordion__button usa-nav__link button-styling"
2626
aria-expanded="false"
2727
aria-controls="basic-nav-section-one"
2828
>

‎app/site/_layouts/org-report.liquid‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
layout: base
33
---
44
<script src="{{ "/assets/js/graphs.js" | url }}"></script>
5-
<div class="grid-container">
5+
<div class="grid-container-org-report">
66
{% assign organization = organizations | findObject: org %}
77

88
<div class="report_heading">
9-
<h1>
9+
<h1 class=report_heading-title>
1010
Report for
1111
<a target="_blank" href="https://github.com/{{ org }}">{{ org }}</a>
1212
<img
@@ -23,7 +23,7 @@ layout: base
2323
<div class="github-information">
2424
<div class="stat-container" id="projects">
2525
<div class="projects-heading">
26-
<h4>
26+
<h4 class=repo-stats>
2727
<span>
2828
<svg
2929
class="usa-icon"
@@ -40,7 +40,7 @@ layout: base
4040
</div>
4141
<div class="stat-container" id="followers">
4242
<div class="followers-heading">
43-
<h4>
43+
<h4 class=repo-stats>
4444
<span>
4545
<svg
4646
class="usa-icon"

‎app/site/projects.liquid‎

Lines changed: 24 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ layout: base
2525
<div class="dashboard-container">
2626
<div class="filters-container">
2727
{% comment %} filter by organization {% endcomment %}
28-
<div class="usa-accordion border-base-lighter border-2px">
29-
<div class="usa-accordion__heading">
30-
<button class="usa-accordion__button font-heading-md text-base-darker" aria-expanded="true" aria-controls="organization-content" id="organization">Organization</button>
28+
<div class="usa-accordion">
29+
<div class="usa-accordion__heading filter-heading">
30+
<button class="usa-accordion__button filter-button" aria-expanded="true" aria-controls="organization-content" id="organization">Organization</button>
3131
</div>
32-
<div id="organization-content" class="usa-accordion__content usa-prose border-top-1px border-base-lighter" hidden>
32+
<div id="organization-content" class="usa-accordion__content filter-content usa-prose" hidden>
3333
<form class="usa-form">
3434
<fieldset class="usa-fieldset" aria-labelledby="organization-filter">
3535
<legend class="usa-sr-only" aria-labelledby="organization-filtering"></legend>
@@ -46,11 +46,11 @@ layout: base
4646
</div>
4747
</div>
4848
{% comment %} filter by maturity model tier {% endcomment %}
49-
<div class="usa-accordion border-base-lighter border-2px">
50-
<div class="usa-accordion__heading">
51-
<button class="usa-accordion__button font-heading-md text-base-darker" aria-expanded="false" aria-controls="tier-content" id="mauturity-model-tier">Maturity Model Tier</button>
49+
<div class="usa-accordion">
50+
<div class="usa-accordion__heading filter-heading">
51+
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="tier-content" id="mauturity-model-tier">Maturity Model Tier</button>
5252
</div>
53-
<div id="tier-content" class="usa-accordion__content usa-prose border-top-1px border-base-lighter" hidden>
53+
<div id="tier-content" class="usa-accordion__content filter-content usa-prose" hidden>
5454
<form class="usa-form">
5555
<fieldset class="usa-fieldset" aria-labelledby="tier-filter">
5656
<legend class="usa-sr-only" aria-labelledby="tier-filtering"></legend>
@@ -67,11 +67,11 @@ layout: base
6767
</div>
6868
</div>
6969
{% comment %} filter by fisma compliance level {% endcomment %}
70-
<div class="usa-accordion border-base-lighter border-2px">
71-
<div class="usa-accordion__heading">
72-
<button class="usa-accordion__button font-heading-md text-base-darker" aria-expanded="false" aria-controls="fisma-level-content" id="fisma-level">FISMA Compliance Level</button>
70+
<div class="usa-accordion">
71+
<div class="usa-accordion__heading filter-heading">
72+
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="fisma-level-content" id="fisma-level">FISMA Compliance Level</button>
7373
</div>
74-
<div id="fisma-level-content" class="usa-accordion__content usa-prose border-top-1px border-base-lighter" hidden>
74+
<div id="fisma-level-content" class="usa-accordion__content filter-content usa-prose" hidden>
7575
<form class="usa-form">
7676
<fieldset class="usa-fieldset" aria-labelledby="fisma-level-filter">
7777
<legend class="usa-sr-only" aria-labelledby="fisma-level-filtering"></legend>
@@ -88,11 +88,11 @@ layout: base
8888
</div>
8989
</div>
9090
{% comment %} filter by project type {% endcomment %}
91-
<div class="usa-accordion border-base-lighter border-2px">
92-
<div class="usa-accordion__heading">
93-
<button class="usa-accordion__button font-heading-md text-base-darker" aria-expanded="false" aria-controls="project-type-content" id="project-type">Project Type</button>
91+
<div class="usa-accordion">
92+
<div class="usa-accordion__heading filter-heading">
93+
<button class="usa-accordion__button filter-button" aria-expanded="false" aria-controls="project-type-content" id="project-type">Project Type</button>
9494
</div>
95-
<div id="project-type-content" class="usa-accordion__content usa-prose border-top-1px border-base-lighter" hidden>
95+
<div id="project-type-content" class="usa-accordion__content filter-content usa-prose" hidden>
9696
<form class="usa-form">
9797
<fieldset class="usa-fieldset" aria-labelledby="project-type-filter">
9898
<legend class="usa-sr-only" aria-labelledby="project-type-filtering"></legend>
@@ -115,7 +115,7 @@ layout: base
115115
<div class="search-and-sort">
116116

117117
<section aria-label="Small search component">
118-
<form class="usa-search usa-search--small" role="search" id="search-form">
118+
<form class="usa-search usa-search--small project-search" role="search" id="search-form">
119119
<label class="usa-sr-only" for="search-input">Search</label>
120120
<input
121121
class="usa-input"
@@ -134,34 +134,10 @@ layout: base
134134
</form>
135135
</section>
136136

137-
<!-- <section aria-label="Small search component" class="sort-dropdown">
138-
<form class="usa-form usa-search usa-search--small" id="sort-selection-form">
139-
<select class="usa-select border-base-light" id="sort-selection" name="sort-selection">
140-
<label class="usa-label" for="sort-selection">Sort by</label>
141-
<option valuer="" disabled selected>Sort By</option>
142-
<option value="name">Project Name</option>
143-
<option value="fisma_level">FISMA Compliance Level</option>
144-
<option value="project_type">Project Type</option>
145-
<option value="stargazers_count">Stars</option>
146-
<option value="maturity_model_tier">Maturity Model Tier</option>
147-
<option value="forks_count">Forks</option>
148-
</select>
149-
<button class="usa-button" type="submit">
150-
<img
151-
src="/assets/img/usa-icons-bg/search--white.svg"
152-
class="usa-search__submit-icon"
153-
alt="Search"
154-
/>
155-
</button>
156-
</form>
157-
</section> -->
158-
159-
160-
161-
<div class="sort-dropdown">
162-
<form class="usa-form" id="sort-selection-form">
163-
<label class="usa-label" for="sort-selection">Sort by</label>
164-
<select class="usa-select border-base-light" id="sort-selection" name="sort-selection">
137+
<div class="sort-dropdown sort-styling">
138+
<form class="usa-form sort-dropdown" id="sort-selection-form">
139+
<label class="usa-label" for="sort-selection"></label>
140+
<select class="usa-select select-sort" id="sort-selection" name="sort-selection">
165141
<option valuer="" disabled selected>Sort By</option>
166142
<option value="name">Project Name</option>
167143
<option value="fisma_level">FISMA Compliance Level</option>
@@ -172,9 +148,9 @@ layout: base
172148
</select>
173149
</form>
174150

175-
<form class="usa-form" id="sort-direction-form">
176-
<label class="usa-label" for="sort-direction">Sort Direction</label>
177-
<select class="usa-select border-base-light" id="sort-direction" name="sort-direction">
151+
<form class="usa-form project-search" id="sort-direction-form">
152+
<label class="usa-label" for="sort-direction"></label>
153+
<select class="usa-select select-sort" id="sort-direction" name="sort-direction">
178154
<option valuer="" disabled selected>Sort Direction</option>
179155
<option value="ascending">Ascending</option>
180156
<option value="descending">Descending</option>

0 commit comments

Comments
 (0)