Skip to content

Commit 5fd7dfe

Browse files
ocefpafocefpaf
authored
Merge pull request #60 from ocefpaf/ohw19_subpath_bake
Ohw19 subpath bake
2 parents c173d8d + aa57731 commit 5fd7dfe

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+9085
-16
lines changed

‎.DS_Store‎

-8 KB
Binary file not shown.

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.travis.yml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,12 @@ install:
2727

2828
script:
2929
- |
30-
if [[ -z "$TRAVIS_TAG" ]]; then
31-
DEPLOY_DIR=dev
32-
else
33-
DEPLOY_DIR="$TRAVIS_TAG"
30+
if [[ -n "$TRAVIS_TAG" ]]; then
31+
python -m doctr deploy --build-tags --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ "$TRAVIS_TAG"
3432
fi
3533
3634
if [[ "${TRAVIS_BRANCH}" == "source" ]]; then
3735
python -m doctr deploy --branch-whitelist source --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ .
3836
elif [[ "${TRAVIS_BRANCH}" == "draft" ]]; then
3937
python -m doctr deploy --branch-whitelist draft --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ draft
4038
fi
41-
python -m doctr deploy --branch-whitelist draft --build-tags --key-path github_deploy_key_oceanhackweek_oceanhackweek_github_io.enc --built-docs _site/ $DEPLOY_DIR

‎_config.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ banner_button_url: projects_2019.html
1212
banner_button_text: 2019 Hack Projects
1313

1414

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

1818
# Homepage tiles
1919
tiles-source: posts # accepts "posts" or "pages"
@@ -23,17 +23,17 @@ tiles-count: 3
2323
featured-image-source:
2424

2525
# Social settings
26+
github_url: https://github.com/oceanhackweek
27+
slack_url: https://oceanhackweek.slack.com
28+
email_url: oceanhackweek@uw.edu
2629
500px_url:
2730
facebook_url:
28-
github_url: https://github.com/oceanhackweek
2931
gitlab_url:
3032
googleplus_url:
3133
instagram_url:
3234
linkedin_url:
3335
pinterest_url:
34-
slack_url: https://oceanhackweek2019.slack.com
3536
twitter_url:
36-
email_url: oceanhkw@uw.edu
3737

3838
# Build settings
3939
markdown: kramdown

‎_pages/02-hackweek.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ where data are large and complex and the community is diverse and collaborative.
2222
The hackweek model was spearheaded by the successful [*Astro-*](http://astrohackweek.org/2019/),
2323
[*Neuro-*](https://neurohackweek.github.io/), and [*Geohackweek*](https://geohackweek.github.io/).
2424

25-
[See what we did in Oceanhackweek 2018](https://oceanhackweek.github.io/schedule.html).
25+
[See what we did in Oceanhackweek 2018](https://oceanhackweek.github.io/ohw2018/schedule.html).

‎assets‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎assets/css/font-awesome.min.css‎

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/css/ie8.css‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
/*
2+
Spectral by HTML5 UP
3+
html5up.net | @ajlkn
4+
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
5+
*/
6+
7+
/* Icon */
8+
9+
.icon.major {
10+
border: none;
11+
}
12+
13+
.icon.major:before {
14+
font-size: 3em;
15+
}
16+
17+
/* Form */
18+
19+
label {
20+
color: #2E3842;
21+
}
22+
23+
input[type="text"],
24+
input[type="password"],
25+
input[type="email"],
26+
select,
27+
textarea {
28+
border: solid 1px #dfdfdf;
29+
}
30+
31+
/* Button */
32+
33+
input[type="submit"],
34+
input[type="reset"],
35+
input[type="button"],
36+
button,
37+
.button {
38+
border: solid 2px #dfdfdf;
39+
}
40+
41+
input[type="submit"].special,
42+
input[type="reset"].special,
43+
input[type="button"].special,
44+
button.special,
45+
.button.special {
46+
border: 0 !important;
47+
}
48+
49+
/* Page Wrapper + Menu */
50+
51+
#menu {
52+
display: none;
53+
}
54+
55+
body.is-menu-visible #menu {
56+
display: block;
57+
}
58+
59+
/* Header */
60+
61+
#header nav > ul > li > a.menuToggle:after {
62+
display: none;
63+
}
64+
65+
/* Banner + Wrapper (style4) */
66+
67+
#banner,
68+
.wrapper.style4 {
69+
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
70+
}
71+
72+
#banner:before,
73+
.wrapper.style4:before {
74+
display: none;
75+
}
76+
77+
/* Banner */
78+
79+
#banner .more {
80+
height: 4em;
81+
}
82+
83+
#banner .more:after {
84+
display: none;
85+
}
86+
87+
/* Main */
88+
89+
#main > header {
90+
-ms-behavior: url("assets/js/ie/backgroundsize.min.htc");
91+
}
92+
93+
#main > header:before {
94+
display: none;
95+
}

‎assets/css/ie9.css‎

Lines changed: 125 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,125 @@
1+
/*
2+
Spectral by HTML5 UP
3+
html5up.net | @ajlkn
4+
Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
5+
*/
6+
7+
/* Spotlight */
8+
9+
.spotlight {
10+
display: block;
11+
}
12+
13+
.spotlight .image {
14+
display: inline-block;
15+
vertical-align: top;
16+
}
17+
18+
.spotlight .content {
19+
padding: 4em 4em 2em 4em ;
20+
display: inline-block;
21+
}
22+
23+
.spotlight:after {
24+
clear: both;
25+
content: '';
26+
display: block;
27+
}
28+
29+
/* Features */
30+
31+
.features {
32+
display: block;
33+
}
34+
35+
.features li {
36+
float: left;
37+
}
38+
39+
.features:after {
40+
content: '';
41+
display: block;
42+
clear: both;
43+
}
44+
45+
/* Banner + Wrapper (style4) */
46+
47+
#banner,
48+
.wrapper.style4 {
49+
background-image: url("../../assets/images/banner.jpg");
50+
background-position: center center;
51+
background-repeat: no-repeat;
52+
background-size: cover;
53+
position: relative;
54+
}
55+
56+
#banner:before,
57+
.wrapper.style4:before {
58+
background: #000000;
59+
content: '';
60+
height: 100%;
61+
left: 0;
62+
opacity: 0.5;
63+
position: absolute;
64+
top: 0;
65+
width: 100%;
66+
}
67+
68+
#banner .inner,
69+
.wrapper.style4 .inner {
70+
position: relative;
71+
z-index: 1;
72+
}
73+
74+
/* Banner */
75+
76+
#banner {
77+
padding: 14em 0 12em 0 ;
78+
height: auto;
79+
}
80+
81+
#banner:after {
82+
display: none;
83+
}
84+
85+
/* CTA */
86+
87+
#cta .inner header {
88+
float: left;
89+
}
90+
91+
#cta .inner .actions {
92+
float: left;
93+
}
94+
95+
#cta .inner:after {
96+
clear: both;
97+
content: '';
98+
display: block;
99+
}
100+
101+
/* Main */
102+
103+
#main > header {
104+
background-image: url("../../assets/images/banner.jpg");
105+
background-position: center center;
106+
background-repeat: no-repeat;
107+
background-size: cover;
108+
position: relative;
109+
}
110+
111+
#main > header:before {
112+
background: #000000;
113+
content: '';
114+
height: 100%;
115+
left: 0;
116+
opacity: 0.5;
117+
position: absolute;
118+
top: 0;
119+
width: 100%;
120+
}
121+
122+
#main > header > * {
123+
position: relative;
124+
z-index: 1;
125+
}

‎assets/css/images/arrow.svg‎

Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)