Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 582ef6f

Browse files
mscottfordmscottford
authored
Merge pull request #14 from corgibytes/home-updates
Home updates
2 parents a5bb987 + a418980 commit 582ef6f

File tree

13 files changed

+45
-42
lines changed

13 files changed

+45
-42
lines changed

‎Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ ENV BUNDLE_GEMFILE=/app/Gemfile \
99
BUNDLE_PATH=/bundle
1010

1111
RUN apt-get update
12-
RUN apt-get install --assume-yes default-jre
12+
RUN apt-get install --assume-yes curl
13+
RUN curl -sL https://deb.nodesource.com/setup_12.x | bash
14+
RUN apt-get install --assume-yes nodejs
1315
RUN gem install bundler
1416
RUN bundle install

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Going to use template? Go on! The only thing we ask - let us know at [*lviv@gdg.
9797
| [GDG DevFest Omsk 2014](http://gdg-devfest-omsk.org/) | [2014 南阳 GDG Devfest 大会](http://devfest.gdgny.org) | [DevFest Nordeste 2014](http://2014.devfestne.com.br/) |
9898
| [GDG DevFest The Netherlands](http://www.devfest.nl/) | [DevFest Centro-Oeste 2014](http://www.devfestcentrooeste.com.br/) | [Android DevFest Space Coast](http://gdg-space-coast.github.io/zeppelin/) |
9999
| [DevFest SP 2014](http://sp.devfest.com.br/) | [DevFest in Baroda](http://devfest.gdgbaroda.com/) | [GDG Hi Pic (France)](http://maximemularz.github.io/zeppelin/) |
100-
| [GDG DevFest Córdoba 2014](http://gdgcordoba.github.io/zeppelin/) | [GDG DevFest Düsseldorf 2014](http://www.gdg-dus.de/DevFest2014/) | [GDG Makerere DevFest 2014](http://gdgmakerere.github.io/) |
100+
| [GDG DevFest Cordoba 2014](http://gdgcordoba.github.io/zeppelin/) | [GDG DevFest Düsseldorf 2014](http://www.gdg-dus.de/DevFest2014/) | [GDG Makerere DevFest 2014](http://gdgmakerere.github.io/) |
101101
| [GDG Dublin DevFest 2014](http://gdg-dublin.appspot.com/) | [GDG Busitema DevFest 2014](http://gdgbusitema.github.io/) | [DevFest Vienna 2014](http://www.devfest.at/) |
102102
| [Android Wear DevFest](http://devfest.gdgnorthjersey.com/wear2014/) | [GDG SLAU DevFest 2014](http://gdgslau.github.io/) | [Lima DevFest](http://limadevfest.com/) |
103103
| [GDG Korea DevFair 2014](http://devfair2014.gdg.kr/) | [GDG DevFest Kota Kinabalu 2014](http://devfest.gdgkk.info/) | [GDG DevFest Belgium](http://gdg-brussels.org/DevFest2014/) |
@@ -112,7 +112,7 @@ Going to use template? Go on! The only thing we ask - let us know at [*lviv@gdg.
112112
| [Women Techmakers Tbilisi 2015](http://womentechmakers.ge/) | [Android Xtended](http://www.androidxtended.com/) |[GDG Bingham University](http://binghamuni.edu.ng/gdg)|
113113
| [JSday Maceio 2015](http://jsday.com.br) | [DevFest Nordeste 2015](http://2015.devfestne.com.br) | [GDG DevFest Vijayawada 2015](http://devfest.gdg-vijayawada.org) |
114114
| [Geek Night Recife](http://geeknightrecife.github.io/) | [IO Extended 2016 Madrid ](http://io.gdg.es/) | [AngularCamp](http://angularcamp.org/) |
115-
| [Mobile Era 2016](http://mobileera.rocks/) | [GDG Francisco Beltrão](http://gdg-fb.github.io) | [Women Techmakers Istanbul 2016](http://2016.wtmistanbul.com) |
115+
| [Mobile Era 2016](http://mobileera.rocks/) | [GDG Francisco Beltrao](http://gdg-fb.github.io) | [Women Techmakers Istanbul 2016](http://2016.wtmistanbul.com) |
116116
| [Droidcon Paris 2015](http://droidcon.fr) | [Android Makers Paris 2017](http://androidmakers.fr) | [Heidelberger Symposium 2017](https://heidelberger-symposium.de/) |
117117
| [DevFest Foumban website](http://devfestfoumban.org) | [NorthSec 2018](https://nsec.io/) | [SwiftFest 2018](http://swiftfest.io) |
118118
| [LASCAR Workshop](http://lascar.sda.tech/) | [Core C++ 2019](https://corecpp.org/) | [RootedCON](https://www.rootedcon.com)|

‎_config.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Plugins
2-
gems:
2+
plugins:
33
- jekyll-sitemap
44
safe: false
55

@@ -8,12 +8,13 @@ markdown: kramdown
88
permalink: pretty
99
exclude: ['/automation/', 'README.md', 'LICENSE.txt', 'CNAME']
1010

11+
encoding: UTF-8
1112

1213
# Site Settings
1314
title: "MenderCon 2020"
1415
email: "[email protected]"
1516
description: "GDG DevFest is a set of events all around the world"
16-
baseurl: "/home"
17+
baseurl: ""
1718
url: "https://mendercon.com"
1819
permalink: "/blog/:title"
1920
googleAnalyticsTrackingId: "UA-43643469-5"
@@ -62,13 +63,11 @@ rightNavigationButtons:
6263

6364
# Hero Block
6465
heroImage: "hero.jpg"
65-
heroTitle: "GDG DevFest <typeout> 2014"
66-
eventDate: "September - November, 2014"
67-
typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"'
68-
typeoutFallback: "Season"
66+
heroTitle: "MenderCon 2020"
67+
eventDate: "May 14, 2020"
6968
heroButtons:
70-
- {link: "https://bit.ly/dfua-c4p", text: "Become a speaker"}
71-
- {permalink: "/#tickets", text: "Buy tickets"}
69+
- {permalink: "#about", text: "Learn more"}
70+
- {link: "https://hopin.to/events/mendercon-2020", text: "Buy tickets"}
7271

7372
# About Block
7473
aboutTitle: "About GDG DevFest"

‎_includes/head.html

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
<meta name="twitter:description" content="{{ site.description }}">
1616
<meta name="twitter:image:src" content="{{ site.socialImageSrcTwitter | prepend: site.baseurl | prepend: site.url }}">
1717
<!-- Social: Facebook / Open Graph -->
18-
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
19-
<meta property="og:site_name" content="{{ site.title }}" />
20-
<meta property="og:type" content="website" />
18+
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
19+
<meta property="og:site_name" content="{{ site.title }}" />
20+
<meta property="og:type" content="website" />
2121
<meta property="og:url" content="{{ site.url }}" />
2222
<meta property="og:image" content="{{ site.socialImageSrcFacebook | prepend: site.baseurl | prepend: site.url }}" />
23-
<meta property="og:description" content="{{ site.description }}" />
24-
23+
<meta property="og:description" content="{{ site.description }}" />
24+
2525
<title>{% if page.title %}{{ page.title }} &bull; {{ site.title }}{% else %}{{ site.title }}{% endif %}</title>
2626
<link rel="shortcut icon" href="{{ "/img/favicons/favicon.ico" | prepend: site.baseurl }}">
2727
<link rel="apple-touch-icon" sizes="152x152" href="{{ "/img/favicons/apple-touch-icon-152x152.png" | prepend: site.baseurl }}">
@@ -40,10 +40,11 @@
4040
<meta name="msapplication-TileColor" content="#2b5797">
4141
<meta name="msapplication-TileImage" content="{{ "/img/favicons/mstile-144x144.png" | prepend: site.baseurl }}">
4242
<meta name="msapplication-config" content="{{ "/img/favicons/browserconfig.xml" | prepend: site.baseurl }}">
43-
43+
4444
<meta name="theme-color" content="#2b5797">
45-
46-
<link href="{{ "/css/main.css" | prepend: site.baseurl }}" rel="stylesheet">
45+
46+
<link href="https://fonts.googleapis.com/css2?family=VT323&display=swap" rel="stylesheet">
47+
<link href="{{ "/css/main.css" | prepend: site.baseurl }}" rel="stylesheet">
4748

4849
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
4950
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

‎_includes/hero.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<div class="content-wrapper">
55
<div class="jumbotron">
66
<div class="animated hiding" data-animation="fadeInDown" data-delay="500">
7-
{% assign heroText = site.heroTitle | split:"<typeout>" %}
8-
<h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span class="typeout-fallback">{{ site.typeoutFallback }}</span>{{ heroText[1] }}</h1>
7+
<h1>{{ site.heroTitle }}</h1>
98
<p>{{ site.eventDate }}</p>
109
{% for button in site.heroButtons %}
1110
<a href="{% if button.permalink != null %} {{ button.permalink | prepend: site.baseurl }} {% else %} {{ button.link }} {% endif %}" class="btn btn-primary waves-effect waves-button waves-light waves-float" {% if button.link != null %}target="_blank"{% endif %}>{{ button.text }}</a>
@@ -19,4 +18,4 @@ <h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span clas
1918
</a>
2019
</div>
2120
</section>
22-
<!-- End Hero Section -->
21+
<!-- End Hero Section -->

‎_layouts/compress.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Jekyll layout that compresses HTML
44
# v0.3.1
55
# https://github.com/penibelst/jekyll-compress-html
6-
# © 2014 Anatol Broder (http://penibelst.de/)
6+
# (c) 2014 Anatol Broder (http://penibelst.de/)
77
# MIT License
88
#
99
---

‎_plugins/generator_scss.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,23 @@
77
# Compiles .scss files in ./_scss to .css files in whatever directory you indicated in your config
88
# Config file placed in ./_sass/config.rb
99
#
10-
10+
1111
require 'sass'
1212
require 'pathname'
1313
require 'compass'
1414
require 'compass/exec'
15-
15+
1616
module Jekyll
17-
17+
1818
class CompassGenerator < Generator
1919
safe true
20-
20+
2121
def generate(site)
2222
Dir.chdir File.expand_path('../_sass', File.dirname(__FILE__)) do
2323
Compass::Exec::SubCommandUI.new(%w(compile)).run!
2424
end
2525
end
26-
26+
2727
end
28-
29-
end
28+
29+
end

‎_sass/config.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
end
1010
end
1111

12-
http_path = "/"
13-
sass_dir = "./"
14-
css_dir = "../css"
15-
images_dir = "../img"
16-
javascripts_dir = "../js"
12+
http_path = "/"
13+
sass_dir = "./"
14+
css_dir = "../css"
15+
images_dir = "../img"
16+
javascripts_dir = "../js"
1717

1818
line_comments = false
19-
relative_assets = true
19+
relative_assets = true
2020
output_style = :compressed
2121

2222
# Remove multiline comments - monkey patch
@@ -25,4 +25,4 @@ class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
2525
def visit_comment(node)
2626
return []
2727
end
28-
end
28+
end

‎_sass/main.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,4 @@
4040
@import "partials/about-hackathon";
4141
@import "partials/judges";
4242
@import "partials/prizes";
43-
@import "partials/hackathon-location";
43+
@import "partials/hackathon-location";

‎_sass/partials/_base.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ $base-font-size: 13px;
1313
$base-line-height: 23px;
1414

1515
// Fixed Font
16-
$fixed-font-family: 'Roboto';
16+
$fixed-font-family: 'VT323', monospace;
1717
$fixed-font-size: 85%;
1818
$fixed-line-height: $base-line-height;
1919

@@ -54,4 +54,4 @@ $image-dir: "../img";
5454
$sprites-dir: $image-dir + "/sprites";
5555
$logos-sprite: $sprites-dir + "/logos.svg";
5656

57-
@import "modules/all";
57+
@import "modules/all";

‎css/main.css

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

‎docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ services:
77
- bundle:/bundle
88
ports:
99
- "80:80"
10+
environment:
11+
- LANG=C.UTF-8
1012
command:
1113
bundle exec jekyll serve -H 0.0.0.0 -P 80 --future
1214
entrypoint:

‎img/sections-background/hero.jpg

-82.7 KB
Loading

0 commit comments

Comments
 (0)