Skip to content

Commit

Permalink
Merge pull request #34 from cuchoi/homepage-buttons
Browse files Browse the repository at this point in the history
Added tagline and buttons to the above the fold content; Modified the Contact Us section
  • Loading branch information
canyon289 committed Aug 10, 2020
2 parents ab650aa + 3b35390 commit 6890f07
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 13 deletions.
6 changes: 6 additions & 0 deletions Makefile
Expand Up @@ -2,5 +2,11 @@ serve:
docker run -it -p 4000:4000 --rm --mount type=bind,source="$(PWD)",target=/srv/jekyll jekyll/jekyll:latest /bin/bash
# docker run --mount type=bind,source="$(pwd)",target=/srv/jekyll/ --rm -it -p 4000:4000 -env JEKYLL_ENV=production jekyll/jekyll:latest /bin/bash

serve-locally:
docker run \
-it --rm \
-p 4000:4000 \
--mount type=bind,source="$(PWD)",target=/srv/jekyll jekyll/jekyll:latest \
bash -c "bundle install && bundle exec jekyll serve --incremental -H 0.0.0.0"


5 changes: 3 additions & 2 deletions README.md
Expand Up @@ -4,7 +4,8 @@

1. Get the jekyll docker image with `docker pull jekyll/jekyll`
2. Get into container bash with `make serve`
3. Run `bundle exec jekyll serve --incremental` in docker shell
3. Run `bundle install` in docker shell
4. Run `bundle exec jekyll serve --incremental -H 0.0.0.0` in docker shell

At this point you should be able to connect to server using a browser at
`127.0.0.1:4000` or open the local `index.html` file in the build
`127.0.0.1:4000` or open the local `index.html` file in the build.
26 changes: 21 additions & 5 deletions _includes/2016_css/agency.css
Expand Up @@ -113,6 +113,10 @@ aside.clients,
background-color: #222;
}

.btn-mr-10 {
margin-right: 10px;
}

.btn-primary {
border-color: #{{ site.data.template.color.primary }};
text-transform: uppercase;
Expand Down Expand Up @@ -368,17 +372,23 @@ header .intro-text .intro-lead-in {
margin-bottom: 25px;
font-family: {{ site.data.template.font.secondary }};
font-size: 22px;
font-style: italic;
line-height: 22px;
}

header .intro-text .intro-lead-in-sub {
margin-bottom: 25px;
font-family: {{ site.data.template.font.secondary }};
font-size: 12px;
font-style: italic;
}

header .intro-text .intro-heading {
margin-bottom: 25px;
text-transform: uppercase;
font-family: {{ site.data.template.font.primary }};
font-size: 40px;
font-size: 34px;
font-weight: 700;
line-height: 40px;
line-height: 34px;
}

@media(min-width:768px) {
Expand All @@ -390,9 +400,15 @@ header .intro-text .intro-heading {
header .intro-text .intro-lead-in {
margin-bottom: 25px;
font-family: {{ site.data.template.font.secondary }};
font-size: 40px;
font-size: 34px;
line-height: 34px;
}

header .intro-text .intro-lead-in-sub {
margin-bottom: 25px;
font-family: {{ site.data.template.font.secondary }};
font-size: 20px;
font-style: italic;
line-height: 40px;
}

header .intro-text .intro-heading {
Expand Down
3 changes: 1 addition & 2 deletions _includes/2017_data/contact.html
Expand Up @@ -2,8 +2,7 @@
<div class="container">
<div class="row">
<div class="col-lg-12 text-center">
<h2 class="section-heading">Contact Us</h2>
<h3 class="section-subheading text-muted">We are working on a contact mechanism. Please hold!</a></h3>
<a class="section-heading btn-info btn-lg" href="https://forms.gle/8P1pNdHPyTQqevWa9">Contact us for sponsorship or other questions</a>
</div>
</div>
</section>
13 changes: 9 additions & 4 deletions _layouts/2017_home.html
Expand Up @@ -14,10 +14,15 @@
<div class="container">
<div class="intro-text">
<div class="intro-heading">PymCon 2020<br></div>
<div class="intro-lead-in">First Week of November (Tentative)</div>
<div class="intro-lead-in">Location: Global</div>
<!-- Hard code button because I don't know how the internet works :( -->
<a href="./cfp" class="btn btn-xl" >CFP is now open</a>
<div class="intro-lead-in">An asynchronous-first virtual conference for the Bayesian community</div>
<div class="intro-lead-in-sub">First Week of November (Tentative)</div>
<div class="intro-lead-in-sub">Location: Global</div>
<a href="./cfp" class="btn btn-info btn-lg btn-mr-10">Give a talk</a>

<a href="https://forms.gle/8P1pNdHPyTQqevWa9" class="btn btn-info btn-lg btn-mr-10">Sponsor</a>
<!-- We are not ready for this! <a href="./cfp" class="btn btn-xl" >Attend</a> -->
<a href="#mission" class="btn btn-info btn-lg btn-mr-10">Volunteer</a>

</div>
</div>
</header>
Expand Down

0 comments on commit 6890f07

Please sign in to comment.