Skip to content

Commit

Permalink
finished mvp for resources page
Browse files Browse the repository at this point in the history
  • Loading branch information
DanielJDufour committed Sep 12, 2020
1 parent efbb4af commit eb7cf8f
Show file tree
Hide file tree
Showing 28 changed files with 637 additions and 252 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ _site/
.bundle
.sass-cache
vendor/
_site/*
18 changes: 18 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Contributing

## install dependencies (recommend ruby version >= 2.3.0)
```
gem install bundler jekyll --user-install
bundle install --path vendor/bundle
```

## running development server
```
bundle exec jekyll serve
```

## running development server on a server
If you are running the development server on a server, you won't be able to access the server's internal localhost from your web browser. Instead you have to run on host 0.0.0.0 and then access the server through its domain name or IP address.
```
bundle exec jekyll serve --host=0.0.0.0
```
17 changes: 2 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
# teachosm
Test site for teachosm

## install dependencies (recommend ruby version >= 2.3.0)
```
gem install bundler jekyll --user-install
bundle install --path vendor/bundle
```
# development
For steps on running a local instance for development purposes, please see [CONTRIBUTING.md](CONTRIBUTING.md).

## running development server
```
bundle exec jekyll serve
```

## running development server on a server
If you are running the development server on a server, you won't be able to access the server's internal localhost from your web browser. Instead you have to run on host 0.0.0.0 and then access the server through its domain name or IP address.
```
bundle exec jekyll serve --host=0.0.0.0
```
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
title: TeachOSM
timezone: UTC
collections:
carousel:
title: Carousel
output: false
filters:
title: Filters
output: false
Expand Down
9 changes: 5 additions & 4 deletions _includes/navbar.html
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,12 @@
<li>
<a class="page-scroll" href="{{site.baseurl}}/projects">Projects</a>
</li>
<!--<li>
<li>
<a class="page-scroll" href="{{site.baseurl}}/resources">Resources</a>
</li>-->
<li id=""><a href="https://osmus.wufoo.com/forms/openstreetmap-us-donation-form/">Donate</a>
</li>
</li>
<li>
<a href="https://osmus.wufoo.com/forms/openstreetmap-us-donation-form/">Donate</a>
</li>
</ul>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion _sass/blog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
border-radius: 4px;
padding: 16px;
width: 100%;
margin: 16px;
margin: $panel-border-style-margin;
transition: width 0.25s;
}

Expand Down
Loading

0 comments on commit eb7cf8f

Please sign in to comment.