From b0b147551df0ca396d5e89bed47ca2108a00dc57 Mon Sep 17 00:00:00 2001 From: Arti Zirk Date: Mon, 16 Jul 2018 23:46:24 +0300 Subject: [PATCH] Import laphack page --- Gemfile | 28 -- Gemfile.lock | 57 ---- LICENSE | 2 +- README.md | 26 +- _config.yml | 26 +- _includes/disqus_comments.html | 20 -- _includes/footer.html | 64 ++-- _includes/google-analytics.html | 11 - _includes/head.html | 36 ++- _includes/header.html | 46 ++- _includes/icon-github.html | 1 - _includes/icon-github.svg | 1 - _includes/icon-twitter.html | 1 - _includes/icon-twitter.svg | 1 - _includes/main_nav.html | 4 + _layouts/default.html | 24 +- _layouts/home.html | 25 -- _layouts/page.html | 14 - _layouts/post.html | 17 +- _posts/2017-03-08-welcome-to-jekyll.markdown | 25 -- _sass/contact.scss | 61 ++++ _sass/footer.scss | 32 ++ _sass/header.scss | 95 ++++++ _sass/home.scss | 53 ++++ _sass/mentors.scss | 14 + _sass/minima.scss | 43 --- _sass/minima/_base.scss | 198 ------------- _sass/minima/_layout.scss | 237 --------------- _sass/minima/_syntax-highlighting.scss | 71 ----- about.md | 15 - assets/logo.svg | 291 +++++++++++++++++++ assets/main.scss | 62 ++-- contact.md | 7 + helpdesk.md | 9 + index.html | 44 +++ index.md | 6 - ourwork.md | 8 + student.md | 8 + 38 files changed, 743 insertions(+), 940 deletions(-) delete mode 100644 Gemfile delete mode 100644 Gemfile.lock delete mode 100644 _includes/disqus_comments.html delete mode 100644 _includes/google-analytics.html delete mode 100644 _includes/icon-github.html delete mode 100644 _includes/icon-github.svg delete mode 100644 _includes/icon-twitter.html delete mode 100644 _includes/icon-twitter.svg create mode 100644 _includes/main_nav.html delete mode 100644 _layouts/home.html delete mode 100644 _layouts/page.html delete mode 100644 _posts/2017-03-08-welcome-to-jekyll.markdown create mode 100644 _sass/contact.scss create mode 100644 _sass/footer.scss create mode 100644 _sass/header.scss create mode 100644 _sass/home.scss create mode 100644 _sass/mentors.scss delete mode 100644 _sass/minima.scss delete mode 100644 _sass/minima/_base.scss delete mode 100644 _sass/minima/_layout.scss delete mode 100644 _sass/minima/_syntax-highlighting.scss delete mode 100644 about.md create mode 100644 assets/logo.svg create mode 100644 contact.md create mode 100644 helpdesk.md create mode 100644 index.html delete mode 100644 index.md create mode 100644 ourwork.md create mode 100644 student.md diff --git a/Gemfile b/Gemfile deleted file mode 100644 index 22509bc..0000000 --- a/Gemfile +++ /dev/null @@ -1,28 +0,0 @@ -source "https://rubygems.org" -ruby RUBY_VERSION - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "3.4.1" - -# This is the default theme for new Jekyll sites. You may change this to anything you like. -gem "minima", "~> 2.0" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -# gem "github-pages", group: :jekyll_plugins - -# If you have any plugins, put them here! -group :jekyll_plugins do - gem "jekyll-feed", "~> 0.6" -end - -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] - diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 8d8a622..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,57 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) - colorator (1.1.0) - ffi (1.9.18) - forwardable-extended (2.6.0) - jekyll (3.4.1) - addressable (~> 2.4) - colorator (~> 1.0) - jekyll-sass-converter (~> 1.0) - jekyll-watch (~> 1.1) - kramdown (~> 1.3) - liquid (~> 3.0) - mercenary (~> 0.3.3) - pathutil (~> 0.9) - rouge (~> 1.7) - safe_yaml (~> 1.0) - jekyll-feed (0.9.1) - jekyll (~> 3.3) - jekyll-sass-converter (1.5.0) - sass (~> 3.4) - jekyll-watch (1.5.0) - listen (~> 3.0, < 3.1) - kramdown (1.13.2) - liquid (3.0.6) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - mercenary (0.3.6) - minima (2.1.0) - jekyll (~> 3.3) - pathutil (0.14.0) - forwardable-extended (~> 2.6) - public_suffix (2.0.5) - rb-fsevent (0.9.8) - rb-inotify (0.9.8) - ffi (>= 0.5.0) - rouge (1.11.1) - safe_yaml (1.0.4) - sass (3.4.23) - -PLATFORMS - ruby - -DEPENDENCIES - jekyll (= 3.4.1) - jekyll-feed (~> 0.6) - minima (~> 2.0) - tzinfo-data - -RUBY VERSION - ruby 2.4.0p0 - -BUNDLED WITH - 1.14.6 diff --git a/LICENSE b/LICENSE index 9716c0c..93a8800 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2017 Lapikud +Copyright (c) 2018 Lapikud Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index 9f9f177..6e81f8f 100644 --- a/README.md +++ b/README.md @@ -2,26 +2,32 @@ Tegu on [Jekyll](https://jekyllrb.com/) peale ehitatud uhiuue lehega -# how to dev +# How to dev + +0. (Windows) Install the Windows Subsystem for Linux + + Install Ubuntu + + https://docs.microsoft.com/en-us/windows/wsl/install-win10 1. Install Ruby - sudo apt install ruby + sudo apt install build-essential ruby ruby-dev dh-autoreconf 2. Install Jekyll - gem install jekyll bundler - + sudo gem install jekyll + 3. Clone repo git clone https://github.com/Lapikud/lapikud.github.io.git - -4. Bootstrap - cd lapikud.github.io - bundle +4. Serve the page (Use bash if on Windows) -5. Serve the page + cd lapikud.github.io + jekyll serve --host 0.0.0.0 - bundle exec jekyll serve -w +# Deploy (TODO) + jekyll build + rsync -av _site/. TODO FIXME diff --git a/_config.yml b/_config.yml index 277b858..68dc252 100644 --- a/_config.yml +++ b/_config.yml @@ -1,31 +1,7 @@ -# Welcome to Jekyll! -# -# This config file is meant for settings that affect your whole blog, values -# which you are expected to set up once and rarely edit after that. If you find -# yourself editing this file very often, consider using Jekyll's data files -# feature for the data you need to update frequently. -# -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'bundle exec jekyll serve'. If you change this file, please restart the server process. - -# Site settings -# These are used to personalize your new site. If you look in the HTML files, -# you will see them accessed via {{ site.title }}, {{ site.email }}, and so on. -# You can create any custom variable you would like, and they will be accessible -# in the templates via {{ site.myvariable }}. title: TTÜ Tarkvaraarenduse klubi Lapikud email: about@lapikud.ee description: > # this means to ignore newlines until "baseurl:" - We are awesome -baseurl: "" # the subpath of your site, e.g. /blog + MTÜ Lapikud on TTÜ Tarkvaraarendusklubi, mis ühendab endisi ja praegusi IT huvilisi TTÜ üliõpilasi. Organisatsioon loodi 2002 aastal informaatika tudengite poolt, kelle erialatunnuseks oli "LAP". Targad mehed otsustasid, et järelikult on nad "Lapikud". url: "http://lapikud.ee" # the base hostname & protocol for your site, e.g. http://example.com instagram_username: lapikud github_username: lapikud - -# Build settings -markdown: kramdown -gems: - - jekyll-feed -exclude: - - Gemfile - - Gemfile.lock diff --git a/_includes/disqus_comments.html b/_includes/disqus_comments.html deleted file mode 100644 index 87fa309..0000000 --- a/_includes/disqus_comments.html +++ /dev/null @@ -1,20 +0,0 @@ -{% if page.comments != false and jekyll.environment == "production" %} - -
- - -{% endif %} diff --git a/_includes/footer.html b/_includes/footer.html index dc26507..39be510 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,46 +1,32 @@ -