diff --git a/_includes/navigation.html b/_includes/navigation.html index 580e493..34fef03 100644 --- a/_includes/navigation.html +++ b/_includes/navigation.html @@ -10,21 +10,21 @@ - - - - + diff --git a/_site/404.html b/_site/404.html index 2678607..ebe2a4d 100644 --- a/_site/404.html +++ b/_site/404.html @@ -40,21 +40,21 @@ - - - - + diff --git a/_site/css/styles.css b/_site/css/styles.css index e1aacaf..3ac293c 100644 --- a/_site/css/styles.css +++ b/_site/css/styles.css @@ -12,10 +12,10 @@ Table Of Contents: ******************************************/ -/**************************/ -/* Colors */ -/**************************/ :root { + /**************************/ + /* Colors */ + /**************************/ --black: #000000; --white: #FFFFFF; --off-white: rgb(233, 231, 231); @@ -26,6 +26,12 @@ Table Of Contents: --link-hover: #093A57; --link-light: #55DDFF; --link-light-hover: #40B4D0; + + /**************************/ + /* Constant */ + /**************************/ + --nav-height-full: 99px; + --nav-height-min: 83.25px; } @@ -37,7 +43,7 @@ body, html { width: 100%; height: 100%; - padding-top: 50px; + padding-top: calc(var(--nav-height-full) / 2); } body, p, li { @@ -106,10 +112,6 @@ p { margin-top: 0.25rem; } -.table { - margin-top: 2rem; -} - .li-space-lg li { margin-bottom: 0.5rem; } @@ -151,10 +153,11 @@ p { background-color: var(--white); } -a.nav-link { +a.nav-link, a.dropdown-item { font-weight: 700; font-size: 1.25rem; line-height: 0.875rem; + text-decoration: none; } .navbar .logo-image img { @@ -183,7 +186,8 @@ a.nav-link { } .navbar .nav-item.dropdown.show .nav-link, -.navbar .nav-item .nav-link:hover{ +.navbar .nav-item .nav-link:hover, +a.dropdown-item:hover { color: var(--maroon); } @@ -194,7 +198,9 @@ a.nav-link { background-color: var(--white); } -/* end of dropdown menu */ +.dropdown-item:hover{ + background-color: var(--white); +} .navbar .navbar-toggler { padding: 0; @@ -380,8 +386,19 @@ ul.bullets-special { font-size: 1.3rem; } +/* Table style */ +.table { + margin-top: 2rem; +} + +thead { + position: sticky; + top: var(--nav-height-full); + background-color: var(--white); +} + /**********************/ -/* Call to Action Block */ +/* Call to Action Block */ /**********************/ .call-to-action { padding-top: 2rem; @@ -479,8 +496,14 @@ ul.bullets-special { grid-template-columns: repeat(1, 1fr); } /* Adjust padding at top of page for decreased nav height */ + /* Why does the body have such weird padding math? I have no clue */ body { - padding-top: 34.25px; + padding-top: calc(var(--nav-height-min) / 2 - 8px); + } + + /* Table header sticky offset for same reason */ + thead { + top: var(--nav-height-min); } /* Header type */ @@ -524,10 +547,17 @@ ul.bullets-special { } /* Navigation */ - a.nav-link { + + a.nav-link, a.dropdown-item { font-size: 1.1rem; } + .navbar .dropdown-menu { + margin-top: 0; + margin-bottom: 0; + padding: 0.25rem 0; + } + .navbar .logo-image img { width: 175px; height: auto; @@ -539,6 +569,10 @@ ul.bullets-special { .navbar .nav-item .nav-link { padding-left: 0; + } + + .navbar .nav-item .dropdown-menu { + display: block; } } /* End of medium screen width */ @@ -681,6 +715,20 @@ ul.bullets-special { /* Large and X-Large */ @media (min-width: 992px) { + /* Navigation bar */ + .navbar .nav-item .dropdown-menu{ display: none; } + .navbar .nav-item:hover .dropdown-menu{ display: block; } + .navbar .nav-item .dropdown-menu { + margin-top:0; + border-bottom: 1px solid var(--off-white); + } + a.dropdown-item { + margin-top: 0.75rem; + margin-bottom: 0.5rem; + padding-left: 1.5rem; + } + /* end of navigation */ + /* Footer */ .footer .footer-col { margin-bottom: 2rem; diff --git a/_site/get-involved.html b/_site/get-involved.html index 70b7220..5065c4f 100644 --- a/_site/get-involved.html +++ b/_site/get-involved.html @@ -37,21 +37,21 @@ - - - - + diff --git a/_site/images/members/jchartrand.jpg b/_site/images/members/jchartrand.jpg index f1e42ce..89a4dff 100644 Binary files a/_site/images/members/jchartrand.jpg and b/_site/images/members/jchartrand.jpg differ diff --git a/_site/index.html b/_site/index.html index 76e2e28..1c218aa 100644 --- a/_site/index.html +++ b/_site/index.html @@ -37,21 +37,21 @@ - - - - + diff --git a/_site/membership.html b/_site/membership.html index b851e89..630275d 100644 --- a/_site/membership.html +++ b/_site/membership.html @@ -37,21 +37,21 @@ - - - - + @@ -90,7 +90,7 @@

We invite you to get involved!

Joining the Digital Credentials Consortium begins with a conversation, let’s talk!

-
+
diff --git a/_site/publications.html b/_site/publications.html index 71d2b58..587756c 100644 --- a/_site/publications.html +++ b/_site/publications.html @@ -37,21 +37,21 @@ - - - - +
diff --git a/_site/team.html b/_site/team.html index 9d1d70c..9ba6f51 100644 --- a/_site/team.html +++ b/_site/team.html @@ -37,21 +37,21 @@ - - - - + diff --git a/_site/who-we-are.html b/_site/who-we-are.html index 62e552a..62b09f8 100644 --- a/_site/who-we-are.html +++ b/_site/who-we-are.html @@ -37,21 +37,21 @@ - - - - + diff --git a/css/styles.css b/css/styles.css index e1aacaf..3ac293c 100644 --- a/css/styles.css +++ b/css/styles.css @@ -12,10 +12,10 @@ Table Of Contents: ******************************************/ -/**************************/ -/* Colors */ -/**************************/ :root { + /**************************/ + /* Colors */ + /**************************/ --black: #000000; --white: #FFFFFF; --off-white: rgb(233, 231, 231); @@ -26,6 +26,12 @@ Table Of Contents: --link-hover: #093A57; --link-light: #55DDFF; --link-light-hover: #40B4D0; + + /**************************/ + /* Constant */ + /**************************/ + --nav-height-full: 99px; + --nav-height-min: 83.25px; } @@ -37,7 +43,7 @@ body, html { width: 100%; height: 100%; - padding-top: 50px; + padding-top: calc(var(--nav-height-full) / 2); } body, p, li { @@ -106,10 +112,6 @@ p { margin-top: 0.25rem; } -.table { - margin-top: 2rem; -} - .li-space-lg li { margin-bottom: 0.5rem; } @@ -151,10 +153,11 @@ p { background-color: var(--white); } -a.nav-link { +a.nav-link, a.dropdown-item { font-weight: 700; font-size: 1.25rem; line-height: 0.875rem; + text-decoration: none; } .navbar .logo-image img { @@ -183,7 +186,8 @@ a.nav-link { } .navbar .nav-item.dropdown.show .nav-link, -.navbar .nav-item .nav-link:hover{ +.navbar .nav-item .nav-link:hover, +a.dropdown-item:hover { color: var(--maroon); } @@ -194,7 +198,9 @@ a.nav-link { background-color: var(--white); } -/* end of dropdown menu */ +.dropdown-item:hover{ + background-color: var(--white); +} .navbar .navbar-toggler { padding: 0; @@ -380,8 +386,19 @@ ul.bullets-special { font-size: 1.3rem; } +/* Table style */ +.table { + margin-top: 2rem; +} + +thead { + position: sticky; + top: var(--nav-height-full); + background-color: var(--white); +} + /**********************/ -/* Call to Action Block */ +/* Call to Action Block */ /**********************/ .call-to-action { padding-top: 2rem; @@ -479,8 +496,14 @@ ul.bullets-special { grid-template-columns: repeat(1, 1fr); } /* Adjust padding at top of page for decreased nav height */ + /* Why does the body have such weird padding math? I have no clue */ body { - padding-top: 34.25px; + padding-top: calc(var(--nav-height-min) / 2 - 8px); + } + + /* Table header sticky offset for same reason */ + thead { + top: var(--nav-height-min); } /* Header type */ @@ -524,10 +547,17 @@ ul.bullets-special { } /* Navigation */ - a.nav-link { + + a.nav-link, a.dropdown-item { font-size: 1.1rem; } + .navbar .dropdown-menu { + margin-top: 0; + margin-bottom: 0; + padding: 0.25rem 0; + } + .navbar .logo-image img { width: 175px; height: auto; @@ -539,6 +569,10 @@ ul.bullets-special { .navbar .nav-item .nav-link { padding-left: 0; + } + + .navbar .nav-item .dropdown-menu { + display: block; } } /* End of medium screen width */ @@ -681,6 +715,20 @@ ul.bullets-special { /* Large and X-Large */ @media (min-width: 992px) { + /* Navigation bar */ + .navbar .nav-item .dropdown-menu{ display: none; } + .navbar .nav-item:hover .dropdown-menu{ display: block; } + .navbar .nav-item .dropdown-menu { + margin-top:0; + border-bottom: 1px solid var(--off-white); + } + a.dropdown-item { + margin-top: 0.75rem; + margin-bottom: 0.5rem; + padding-left: 1.5rem; + } + /* end of navigation */ + /* Footer */ .footer .footer-col { margin-bottom: 2rem; diff --git a/images/.DS_Store b/images/.DS_Store index 3eea9f2..5572c84 100644 Binary files a/images/.DS_Store and b/images/.DS_Store differ diff --git a/images/members/.DS_Store b/images/members/.DS_Store index c4ffe03..6fb128c 100644 Binary files a/images/members/.DS_Store and b/images/members/.DS_Store differ diff --git a/images/members/jchartrand.jpg b/images/members/jchartrand.jpg index f1e42ce..89a4dff 100644 Binary files a/images/members/jchartrand.jpg and b/images/members/jchartrand.jpg differ diff --git a/membership.md b/membership.md index 33b5a4e..041e2ce 100644 --- a/membership.md +++ b/membership.md @@ -21,7 +21,7 @@ DCC members focus on collaborative projects and individual institutional priorit Joining the Digital Credentials Consortium begins with a conversation, let’s talk! -
+