Skip to content

Commit

Permalink
Merge pull request #60 from ocefpaf/ohw19_subpath_bake
Browse files Browse the repository at this point in the history
Ohw19 subpath bake
  • Loading branch information
ocefpaf authored Apr 2, 2020
2 parents c173d8d + aa57731 commit 5fd7dfe
Show file tree
Hide file tree
Showing 83 changed files with 9,085 additions and 16 deletions.
Binary file removed .DS_Store
Binary file not shown.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

7 changes: 2 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,12 @@ install:

script:
- |
if [[ -z "$TRAVIS_TAG" ]]; then
DEPLOY_DIR=dev
else
DEPLOY_DIR="$TRAVIS_TAG"
if [[ -n "$TRAVIS_TAG" ]]; then
python -m doctr deploy --build-tags --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ "$TRAVIS_TAG"
fi
if [[ "${TRAVIS_BRANCH}" == "source" ]]; then
python -m doctr deploy --branch-whitelist source --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ .
elif [[ "${TRAVIS_BRANCH}" == "draft" ]]; then
python -m doctr deploy --branch-whitelist draft --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ draft
fi
python -m doctr deploy --branch-whitelist draft --build-tags --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ $DEPLOY_DIR
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ banner_button_url: projects_2019.html
banner_button_text: 2019 Hack Projects


baseurl: "" # the subpath of your site, e.g. /blog
url: "" # the base hostname & protocol for your site
baseurl: "/ohw19" # the subpath of your site, e.g. /blog
BASE_PATH : /ohw19

# Homepage tiles
tiles-source: posts # accepts "posts" or "pages"
Expand All @@ -23,17 +23,17 @@ tiles-count: 3
featured-image-source:

# Social settings
github_url: https://github.com/oceanhackweek
slack_url: https://oceanhackweek.slack.com
email_url: [email protected]
500px_url:
facebook_url:
github_url: https://github.com/oceanhackweek
gitlab_url:
googleplus_url:
instagram_url:
linkedin_url:
pinterest_url:
slack_url: https://oceanhackweek2019.slack.com
twitter_url:
email_url: [email protected]

# Build settings
markdown: kramdown
Expand Down
2 changes: 1 addition & 1 deletion _pages/02-hackweek.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ where data are large and complex and the community is diverse and collaborative.
The hackweek model was spearheaded by the successful [*Astro-*](http://astrohackweek.org/2019/),
[*Neuro-*](https://neurohackweek.github.io/), and [*Geohackweek*](https://geohackweek.github.io/).

[See what we did in Oceanhackweek 2018](https://oceanhackweek.github.io/schedule.html).
[See what we did in Oceanhackweek 2018](https://oceanhackweek.github.io/ohw2018/schedule.html).
1 change: 0 additions & 1 deletion assets

This file was deleted.

4 changes: 4 additions & 0 deletions assets/css/font-awesome.min.css

Large diffs are not rendered by default.

95 changes: 95 additions & 0 deletions assets/css/ie8.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
/*
Spectral by HTML5 UP
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
*/

/* Icon */

.icon.major {
border: none;
}

.icon.major:before {
font-size: 3em;
}

/* Form */

label {
color: #2E3842;
}

input[type="text"],
input[type="password"],
input[type="email"],
select,
textarea {
border: solid 1px #dfdfdf;
}

/* Button */

input[type="submit"],
input[type="reset"],
input[type="button"],
button,
.button {
border: solid 2px #dfdfdf;
}

input[type="submit"].special,
input[type="reset"].special,
input[type="button"].special,
button.special,
.button.special {
border: 0 !important;
}

/* Page Wrapper + Menu */

#menu {
display: none;
}

body.is-menu-visible #menu {
display: block;
}

/* Header */

#header nav > ul > li > a.menuToggle:after {
display: none;
}

/* Banner + Wrapper (style4) */

#banner,
.wrapper.style4 {
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
}

#banner:before,
.wrapper.style4:before {
display: none;
}

/* Banner */

#banner .more {
height: 4em;
}

#banner .more:after {
display: none;
}

/* Main */

#main > header {
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
}

#main > header:before {
display: none;
}
125 changes: 125 additions & 0 deletions assets/css/ie9.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
/*
Spectral by HTML5 UP
html5up.net | @ajlkn
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
*/

/* Spotlight */

.spotlight {
display: block;
}

.spotlight .image {
display: inline-block;
vertical-align: top;
}

.spotlight .content {
padding: 4em 4em 2em 4em ;
display: inline-block;
}

.spotlight:after {
clear: both;
content: '';
display: block;
}

/* Features */

.features {
display: block;
}

.features li {
float: left;
}

.features:after {
content: '';
display: block;
clear: both;
}

/* Banner + Wrapper (style4) */

#banner,
.wrapper.style4 {
background-image: url("../../assets/images/banner.jpg");
background-position: center center;
background-repeat: no-repeat;
background-size: cover;
position: relative;
}

#banner:before,
.wrapper.style4:before {
background: #000000;
content: '';
height: 100%;
left: 0;
opacity: 0.5;
position: absolute;
top: 0;
width: 100%;
}

#banner .inner,
.wrapper.style4 .inner {
position: relative;
z-index: 1;
}

/* Banner */

#banner {
padding: 14em 0 12em 0 ;
height: auto;
}

#banner:after {
display: none;
}

/* CTA */

#cta .inner header {
float: left;
}

#cta .inner .actions {
float: left;
}

#cta .inner:after {
clear: both;
content: '';
display: block;
}

/* Main */

#main > header {
background-image: url("../../assets/images/banner.jpg");
background-position: center center;
background-repeat: no-repeat;
background-size: cover;
position: relative;
}

#main > header:before {
background: #000000;
content: '';
height: 100%;
left: 0;
opacity: 0.5;
position: absolute;
top: 0;
width: 100%;
}

#main > header > * {
position: relative;
z-index: 1;
}
6 changes: 6 additions & 0 deletions assets/css/images/arrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions assets/css/images/bars.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions assets/css/images/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5fd7dfe

Please sign in to comment.