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

Jump to bottom

Limit intro width, fix post padding #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Limit intro width, fix post padding #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion _includes/front.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ title: Edge Collective
---

{% set css %}
{% include "sample.css" %}
{% include "reset.css" %}
{% include "style.css" %}
{% endset %}
<!-- feed it through our cssmin filter to minify -->
<style>
Expand Down
3 changes: 2 additions & 1 deletion _includes/layout.njk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ title: Edge Collective
---

{% set css %}
{% include "sample.css" %}
{% include "reset.css" %}
{% include "style.css" %}
{% endset %}
<!-- feed it through our cssmin filter to minify -->
<style>
Expand Down
12 changes: 10 additions & 2 deletions _includes/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ body {
padding-top: 15px
}

#profile_pic {
#intro {
max-width: 800px;
}

#profile-pic {
float:right;
margin:0em 0em 1em 1em;
}
Expand Down Expand Up @@ -58,7 +62,7 @@ a:visited{
.post {
float: left;
width: 33.33%;
padding-right: 20px;
padding: 0 20px 20px 0;
}

.post .post-contents {
Expand Down Expand Up @@ -87,4 +91,8 @@ a:visited{
.post {
width: 100%;
}

#profile-pic {
float: none;
}
}
2 changes: 1 addition & 1 deletion _site/drafts/hardware2/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- feed it through our cssmin filter to minify -->
<style>
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#intro{max-width:800px}#profile-pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding:0 20px 20px 0}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}#profile-pic{float:none}}
</style>

<!doctype html>
Expand Down
2 changes: 1 addition & 1 deletion _site/drafts/quahog/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- feed it through our cssmin filter to minify -->
<style>
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#intro{max-width:800px}#profile-pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding:0 20px 20px 0}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}#profile-pic{float:none}}
</style>

<!doctype html>
Expand Down
118 changes: 52 additions & 66 deletions _site/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- feed it through our cssmin filter to minify -->
<style>
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#intro{max-width:800px}#profile-pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding:0 20px 20px 0}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}#profile-pic{float:none}}
</style>


Expand All @@ -17,87 +17,73 @@
</head>
<body>

<img src="/img/edge_logo.png" id="profile_pic"/>
<div id="intro">
<img src="/img/edge_logo.png" id="profile-pic"/>

<h1> Edge Collective </h1>
<h1> Edge Collective </h1>

<p><a href="http://edgecollective.io">edgecollective.io</a> | dat://edgecollective.hashbase.io</p>
<p><a href="http://edgecollective.io">edgecollective.io</a> | dat://edgecollective.hashbase.io</p>

<p>Edge Collective promotes <b>technological sovereignty</b> for communities living at ‘the edge’, including vulnerable cities, rural townships, farming communities, and islands.</p>
<p>Edge Collective promotes <b>technological sovereignty</b> for communities living at ‘the edge’, including vulnerable cities, rural townships, farming communities, and islands.</p>

<p>Edge Collective strives to use science and technology in <b>cooperative</b> ways in order to enhance <b>well-being, freedom</b>, and <b>solidarity.</b>

<p>We facilitate and produce <b>workshops, trainings</b>, and <b>free and open source technologies</b> with the goal of building locally-owned, resilient municipal and community infrastructure -- using a friendly and collaborative design process. </p>

<p>Recent projects include:</p>

<ul>
<li>resilient communication systems</li>
<li>off-grid water monitoring (flood, drought, salinity)</li>
<li>retrofitting greenhouse control systems</li>
<li>capturing soil health data from remote farm fields</li>
</ul>
<p>Edge Collective strives to use science and technology in <b>cooperative</b> ways in order to enhance <b>well-being, freedom</b>, and <b>solidarity.</b>

<p>We facilitate and produce <b>workshops, trainings</b>, and <b>free and open source technologies</b> with the goal of building locally-owned, resilient municipal and community infrastructure -- using a friendly and collaborative design process. </p>

<p>Recent projects include:</p>

<ul>
<li>resilient communication systems</li>
<li>off-grid water monitoring (flood, drought, salinity)</li>
<li>retrofitting greenhouse control systems</li>
<li>capturing soil health data from remote farm fields</li>
</ul>


<p>All of our <b>designs</b> and <b>code</b> are freely available <a href="http://github.com/edgecollective">online</a>, following the principles of commons-based <a href="https://wiki.p2pfoundation.net/Peer_Production"><b>peer production</b>.</a></p>
<p>All of our <b>designs</b> and <b>code</b> are freely available <a href="http://github.com/edgecollective">online</a>, following the principles of commons-based <a href="https://wiki.p2pfoundation.net/Peer_Production"><b>peer production</b>.</a></p>

<p>If you'd like to <b>collaborate on a project</b>, or to <b>arrange for a workshop</b>, please contact us: </p>
<ul>
<li>via email at collaborate at edgecollective dot io</li>
<li>via <a href="https://cabal.chat">cabal</a> at cabal://5da062c4abca9c3a1f6fad4cccfed64314b61ae70750ab61f739445b80b28221
</ul>

<h2> Research Blog </h2>
<div class="posts-area">

<div class="post">
<div class="post-contents">
<div class="image">
<a href="" src="/posts/notes_vo1/">
<img src="/img/rvol1/bmp388_wiring.png"/>
</a>
</div>
<div class="text">
<h3><a href="/posts/notes_vo1/">R&D Notes Vol 1</a></h3>
<p></p>
<em>2019-06-29</em>
</div>
</div>
</div>
<p>If you'd like to <b>collaborate on a project</b>, or to <b>arrange for a workshop</b>, please contact us: </p>
<ul>
<li>via email at collaborate at edgecollective dot io</li>
<li>via <a href="https://cabal.chat">cabal</a> at cabal://5da062c4abca9c3a1f6fad4cccfed64314b61ae70750ab61f739445b80b28221
</ul>
</div>

<div class="post">
<div class="post-contents">
<div class="image">
<a href="" src="/posts/other/">
<img src="/img/rvol1/feather_board.png"/>
</a>
</div>
<div class="text">
<h3><a href="/posts/other/">Other stuff</a></h3>
<p>null</p>
<em>2019-06-29</em>
<div id="blog">
<h2> Research Blog </h2>
<div class="posts-area">

<div class="post">
<div class="post-contents">
<div class="image">
<a href="" src="/posts/notes_vo1/">
<img src="/img/rvol1/bmp388_wiring.png"/>
</a>
</div>
<div class="text">
<h3><a href="/posts/notes_vo1/">R&D Notes Vol 1</a></h3>
<p></p>
<em>2019-06-29</em>
</div>
</div>
</div>
</div>

<div class="post">
<div class="post-contents">
<div class="image">
<a href="" src="/posts/fieldnodes/">
<img src="/img/field_1/cell_kit.JPG"/>
</a>
</div>
<div class="text">
<h3><a href="/posts/fieldnodes/">Remote Soil Moisture Monitoring</a></h3>
<p>Baseline soil measurements around tree planting sites</p>
<em>2019-07-24</em>

<div class="post">
<div class="post-contents">
<div class="image">
<a href="" src="/posts/fieldnodes/">
<img src="/img/field_1/cell_kit.JPG"/>
</a>
</div>
<div class="text">
<h3><a href="/posts/fieldnodes/">Remote Soil Moisture Monitoring</a></h3>
<p>Baseline soil measurements around tree planting sites</p>
<em>2019-07-24</em>
</div>
</div>
</div>

</div>

</div>


Expand Down
2 changes: 1 addition & 1 deletion _site/posts/fieldnodes/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- feed it through our cssmin filter to minify -->
<style>
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#intro{max-width:800px}#profile-pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding:0 20px 20px 0}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}#profile-pic{float:none}}
</style>

<!doctype html>
Expand Down
2 changes: 1 addition & 1 deletion _site/posts/notes_vo1/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<!-- feed it through our cssmin filter to minify -->
<style>
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}
body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#profile_pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding-right:20px}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}}body{font-family:sans-serif;margin:20px;font-size:small;width:90%;margin-right:auto;margin-left:auto;padding-top:15px}#intro{max-width:800px}#profile-pic{float:right;margin:0 0 1em 1em}h1{line-height:1em;font-size:x-large;margin-bottom:.31em}h2{font-size:large;margin-bottom:1px}h3{font-size:small;margin-bottom:1px}a{text-decoration:none}a:hover{text-decoration:underline}a:visited{color:#00f}*,:after,:before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}.posts-area{width:100%;padding-top:10px}.posts-area:after{content:"";display:table;clear:both}.post{float:left;width:33.33%;padding:0 20px 20px 0}.post .post-contents{background:#f7f7f7;border-radius:5px}.post .image a{display:block;overflow:hidden;height:214px}.post img{object-fit:cover;width:100%;height:100%}.post .text{height:200px;padding:20px}@media (max-width:680px){.post{width:100%}#profile-pic{float:none}}
</style>

<!doctype html>
Expand Down
Loading