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.

Sign up for GitHub

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

Skills Page/Tab update. #116

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Skills Page/Tab update. #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a7da1a
Removed dangling body tags from header and footer. Separated end scri…
kyperbelt Jul 28, 2024
61aaafe
Fixed: moved header and footer into body.
kyperbelt Jul 28, 2024
9176088
Fixed: erroneous backlinks from skills tab.
kyperbelt Jul 28, 2024
ddfe17a
Added end.html and fixed footer/header positioning in layouts.
kyperbelt Jul 28, 2024
34f7324
fix: moved iframe content 10px to ensure its fully concealed.
kyperbelt Jul 28, 2024
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
15 changes: 15 additions & 0 deletions _includes/shared/end.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Bootstrap core JavaScript
================================================== -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<!-- <script src="js/jquery-1.11.1.js"></script> -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- <script src="js/bootstrap.js"></script> -->

<!-- MailChimp Ajax Magic
================================================== -->
<script src="/js/jquery.ajaxchimp.js"></script>
<script>
$('#mc-form').ajaxChimp({
url: 'https://code4sac.us3.list-manage.com/subscribe/post?u=3938e5bd1ff827e6f3903ca84&amp;id=2d40fa1527'
});
</script>
18 changes: 0 additions & 18 deletions _includes/shared/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,21 +20,3 @@
</div>

</footer>

</body>

<!-- Bootstrap core JavaScript
================================================== -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<!-- <script src="js/jquery-1.11.1.js"></script> -->
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script>
<!-- <script src="js/bootstrap.js"></script> -->

<!-- MailChimp Ajax Magic
================================================== -->
<script src="/js/jquery.ajaxchimp.js"></script>
<script>
$('#mc-form').ajaxChimp({
url: 'https://code4sac.us3.list-manage.com/subscribe/post?u=3938e5bd1ff827e6f3903ca84&amp;id=2d40fa1527'
});
</script>
97 changes: 50 additions & 47 deletions _includes/shared/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,56 @@
<body>
<header class="site-header">

<header class="site-header">

<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="/images/codeforsac-logo.png" height="40" alt="Code for Sacramento" /></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="/about" class="dropdown-toggle" data-toggle="dropdown">ABOUT <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/who-we-are"><i class="fa fa-users"></i> Who We Are</a></li>
<li><a href="/what-we-do"><i class="fa fa-wrench"></i> What We Do</a></li>
<li><a href="/projects"><i class="fa fa-cogs"></i> Our Projects</a></li>
<li><a href="/code-of-conduct"><i class="fa fa-file-text"></i> Code of Conduct</a></li>
</ul>
</li>
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar"
aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/"><img src="/images/codeforsac-logo.png" height="40"
alt="Code for Sacramento" /></a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li class="dropdown">
<a href="/about" class="dropdown-toggle" data-toggle="dropdown">ABOUT <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="/who-we-are"><i class="fa fa-users"></i> Who We Are</a></li>
<li><a href="/what-we-do"><i class="fa fa-wrench"></i> What We Do</a></li>
<li><a href="/projects"><i class="fa fa-cogs"></i> Our Projects</a></li>
<li><a href="/code-of-conduct"><i class="fa fa-file-text"></i> Code of Conduct</a></li>
</ul>
</li>


<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">GET INVOLVED <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="http://www.meetup.com/code4sac/" target="_blank"><i class="fa fa-calendar"></i> Show Up</a></li>
<li><a href="https://github.com/code4sac/projects" target="_blank"><i class="fa fa-rocket"></i> Start a Project</a></li>
<li><a href="https://sac-tech.com/" target="_blank"><i class="fa fa-comments"></i> Discuss #SacTech</a></li>
</ul>
</li>
<li><a href="/projects"><i class="fa fa-tasks"></i> PROJECTS</a></li>
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">GET INVOLVED <b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="http://www.meetup.com/code4sac/" target="_blank"><i class="fa fa-calendar"></i> Show Up</a>
</li>
<li><a href="https://github.com/code4sac/projects" target="_blank"><i class="fa fa-rocket"></i> Start a
Project</a></li>
<li><a href="https://sac-tech.com/" target="_blank"><i class="fa fa-comments"></i> Discuss #SacTech</a>
</li>
</ul>
</li>
<li><a href="/projects"><i class="fa fa-tasks"></i> PROJECTS</a></li>


<!-- TODO: Update blog <li><a href="/blog"><i class="fa fa-rss"></i> BLOG</a></li> -->
<li><a href="/contact" target="_blank"><i class="fa fa-paper-plane"></i> CONTACT</a></li>
<li>
<!--<p class="btn donate-btn">-->
<a href="https://codeforsacramento.nationbuilder.com/donate">DONATE NOW</a>
<!--</p>-->
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>
<!-- TODO: Update blog <li><a href="/blog"><i class="fa fa-rss"></i> BLOG</a></li> -->
<li><a href="/contact" target="_blank"><i class="fa fa-paper-plane"></i> CONTACT</a></li>
<li>
<!--<p class="btn donate-btn">-->
<a href="https://codeforsacramento.nationbuilder.com/donate">DONATE NOW</a>
<!--</p>-->
</li>
</ul>
</div><!--/.nav-collapse -->
</div>
</nav>

</header>
</header>
6 changes: 4 additions & 2 deletions _layouts/codeofconduct.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

{% include "shared/head.html" %}

{% include "shared/header.html" %}

<body>

{% include "shared/header.html" %}

<div class="container">

<div class="row">
Expand All @@ -21,4 +21,6 @@

</body>

{% include "shared/end.html" %}

</html>
6 changes: 3 additions & 3 deletions _layouts/default.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
<!DOCTYPE html>
<html lang="en">

{% include "shared/head.html" %}

{% include "shared/header.html" %}
{% include "shared/head.html" %}

<body>
{% include "shared/header.html" %}

<div class="container">

Expand All @@ -21,5 +20,6 @@ <h2>{{ title }}</h2>
{% include "shared/footer.html" %}

</body>
{% include "shared/end.html" %}

</html>
2 changes: 2 additions & 0 deletions _layouts/home.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,6 @@

{% include "shared/footer.html" %}

{% include "shared/end.html" %}

</html>
33 changes: 24 additions & 9 deletions _layouts/skills.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>

{% include "shared/head.html" %}

<head>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">

Expand All @@ -9,23 +12,35 @@

<!--CSS styles that ensure your typeform takes up all the available screen space (DO NOT EDIT!)-->
<style type="text/css">
html{
html {
margin: 0;
height: 100%;
overflow: hidden;
}
iframe{

iframe {
position: absolute;
left:0;
right:0;
bottom:0;
top:0;
border:0;
left: 0;
right: 0;
bottom: 0;
top: -10px;
border: 0;
}
</style>
<script>

</script>
</head>

<body>
<iframe id="typeform-full" width="100%" height="100%" frameborder="0" src="http://codeforsacramento.nationbuilder.com/join"></iframe>
<!-- <script type="text/javascript" src="https://s3-eu-west-1.amazonaws.com/share.typeform.com/embed.js"></script>-->

<div class="z-3">
{% include "shared/header.html" %}
</div>
<iframe id="typeform-full" class="block" width="100%" height="100%" frameborder="0"
src="http://codeforsacramento.nationbuilder.com/join"></iframe>
<!-- <script type="text/javascript" src="https://s3-eu-west-1.amazonaws.com/share.typeform.com/embed.js"></script>-->
</body>

{% include "shared/end.html" %}
</html>