diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 1fecb68..0000000 --- a/.gitattributes +++ /dev/null @@ -1,5 +0,0 @@ -############################################################################### -# Set default behavior to automatically normalize line endings. -############################################################################### -* text=auto - diff --git a/.gitignore b/.gitignore index 45c20ea..4479f58 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ _site .sass-cache +.jekyll-cache .jekyll-metadata -public/ +*.gem +.bundle +vendor/bundle +.DS_Store diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 149247e..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,28 +0,0 @@ -image: ruby:2.3 - -variables: - JEKYLL_ENV: production - LC_ALL: C.UTF-8 - -before_script: - - bundle install - -test: - stage: test - script: - - bundle exec jekyll build -d test - artifacts: - paths: - - test - except: - - master - -pages: - stage: deploy - script: - - bundle exec jekyll build -d public - artifacts: - paths: - - public - only: - - master diff --git a/404.html b/404.html new file mode 100644 index 0000000..79aa369 --- /dev/null +++ b/404.html @@ -0,0 +1,33 @@ +--- +permalink: /404 +layout: default +--- + + + +
+
+ Butter App Feature Logo +

404

+

Page not found :(

+

The requested page could not be found.

+
+
diff --git a/Gemfile b/Gemfile index 19e5a19..6c38134 100644 --- a/Gemfile +++ b/Gemfile @@ -1,9 +1,29 @@ 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. -gem "jekyll", "3.4.0" +# Happy Jekylling! +gem "jekyll", "~> 4.2.0" +# This is the default theme for new Jekyll sites. You may change this to anything you like. +#gem "minima", "~> 2.5" +# 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.12" +end -# Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo", "~> 1.2" + gem "tzinfo-data" +end +# Performance-booster for watching directories on Windows +gem "wdm", "~> 0.1.1", :platforms => [:mingw, :x64_mingw, :mswin] diff --git a/Gemfile.lock b/Gemfile.lock index 8180833..0fc7536 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,51 +1,79 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.5.0) - public_suffix (~> 2.0, >= 2.0.2) + addressable (2.8.0) + public_suffix (>= 2.0.2, < 5.0) colorator (1.1.0) - ffi (1.9.17) + concurrent-ruby (1.1.9) + em-websocket (0.5.2) + eventmachine (>= 0.12.9) + http_parser.rb (~> 0.6.0) + eventmachine (1.2.7-x64-mingw32) + ffi (1.15.4-x64-mingw32) forwardable-extended (2.6.0) - jekyll (3.4.0) + http_parser.rb (0.6.0) + i18n (1.8.10) + concurrent-ruby (~> 1.0) + jekyll (4.2.0) 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) + em-websocket (~> 0.5) + i18n (~> 1.0) + jekyll-sass-converter (~> 2.0) + jekyll-watch (~> 2.0) + kramdown (~> 2.3) + kramdown-parser-gfm (~> 1.0) + liquid (~> 4.0) + mercenary (~> 0.4.0) pathutil (~> 0.9) - rouge (~> 1.7) + rouge (~> 3.0) safe_yaml (~> 1.0) - 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) - pathutil (0.14.0) + terminal-table (~> 2.0) + jekyll-feed (0.15.1) + jekyll (>= 3.7, < 5.0) + jekyll-sass-converter (2.1.0) + sassc (> 2.0.1, < 3.0) + jekyll-watch (2.2.1) + listen (~> 3.0) + kramdown (2.3.1) + rexml + kramdown-parser-gfm (1.1.0) + kramdown (~> 2.0) + liquid (4.0.3) + listen (3.7.0) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + mercenary (0.4.0) + pathutil (0.16.2) 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) + public_suffix (4.0.6) + rb-fsevent (0.11.0) + rb-inotify (0.10.1) + ffi (~> 1.0) + rexml (3.2.5) + rouge (3.26.0) + safe_yaml (1.0.5) + sassc (2.4.0-x64-mingw32) + ffi (~> 1.9) + terminal-table (2.0.0) + unicode-display_width (~> 1.1, >= 1.1.1) + thread_safe (0.3.6) + tzinfo (1.2.9) + thread_safe (~> 0.1) + tzinfo-data (1.2021.1) + tzinfo (>= 1.0.0) + unicode-display_width (1.7.0) + wdm (0.1.1) PLATFORMS - ruby + x64-mingw32 DEPENDENCIES - jekyll (= 3.4.0) + jekyll (~> 4.2.0) + jekyll-feed (~> 0.12) + tzinfo (~> 1.2) tzinfo-data - -RUBY VERSION - ruby 2.3.1p112 + wdm (~> 0.1.1) BUNDLED WITH - 1.13.6 + 2.1.4 diff --git a/JEKYLLREADME.md b/JEKYLLREADME.md deleted file mode 100644 index f122915..0000000 --- a/JEKYLLREADME.md +++ /dev/null @@ -1,119 +0,0 @@ -![Build Status](https://gitlab.com/pages/jekyll/badges/master/build.svg) -![Jekyll Version](https://img.shields.io/gem/v/jekyll.svg) - ---- - -Example [Jekyll] website using GitLab Pages. View it live at https://pages.gitlab.io/jekyll - -[Learn more about GitLab Pages](https://pages.gitlab.io) or read the the [official GitLab Pages documentation](https://docs.gitlab.com/ce/user/project/pages/). - ---- - - - -**Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - -- [Getting Started](#getting-started) - - [Start by forking this repository](#start-by-forking-this-repository) - - [Start from a local Jekyll project](#start-from-a-local-jekyll-project) -- [GitLab CI](#gitlab-ci) -- [Using Jekyll locally](#using-jekyll-locally) -- [GitLab User or Group Pages](#gitlab-user-or-group-pages) -- [Did you fork this project?](#did-you-fork-this-project) -- [Other examples](#other-examples) -- [Troubleshooting](#troubleshooting) - - - -## Getting Started - -You can get started with GitLab Pages using Jekyll easily by either forking this repository or by uploading a new/existing Jekyll project. - -Remember you need to wait for your site to build before you will be able to see your changes. You can track the build on the **Pipelines** tab. - -### Start by forking this repository - -1. Fork this repository. -1. **IMPORTANT:** Remove the fork relationship. -Go to **Settings (⚙)** > **Edit Project** and click the **"Remove fork relationship"** button. -1. Enable Shared Runners. -Go to **Settings (⚙)** > **Pipelines** and click the **"Enable shared Runners"** button. -1. Rename the repository to match the name you want for your site. -1. Edit your website through GitLab or clone the repository and push your changes. - -### Start from a local Jekyll project - -1. [Install][] Jekyll. -1. Use `jekyll new` to create a new Jekyll Project. -1. Add [this `.gitlab-ci.yml`](.gitlab-ci.yml) to the root of your project. -1. Push your repository and changes to GitLab. - -## GitLab CI - -This project's static Pages are built by [GitLab CI][ci], following the steps -defined in [`.gitlab-ci.yml`](.gitlab-ci.yml): - -``` -image: ruby:2.3 - -variables: - JEKYLL_ENV: production - -pages: - script: - - bundle install - - bundle exec jekyll build -d public - artifacts: - paths: - - public - only: - - master -``` - -## Using Jekyll locally - -To work locally with this project, you'll have to follow the steps below: - -1. Fork, clone or download this project -1. [Install][] Jekyll -1. Download dependencies: `bundle` -1. Build and preview: `bundle exec jekyll serve` -1. Add content - -The above commands should be executed from the root directory of this project. - -Read more at Jekyll's [documentation][]. - -## GitLab User or Group Pages - -To use this project as your user/group website, you will need one additional -step: just rename your project to `namespace.gitlab.io`, where `namespace` is -your `username` or `groupname`. This can be done by navigating to your -project's **Settings**. - -Read more about [user/group Pages][userpages] and [project Pages][projpages]. - -## Did you fork this project? - -If you forked this project for your own use, please go to your project's -**Settings** and remove the forking relationship, which won't be necessary -unless you want to contribute back to the upstream project. - -## Other examples - -* [jekyll-branched](https://gitlab.com/pages/jekyll-branched) demonstrates how you can keep your GitLab Pages site in one branch and your project's source code in another. -* The [jekyll-themes](https://gitlab.com/groups/jekyll-themes) group contains a collection of example projects you can fork (like this one) having different visual styles. - -## Troubleshooting - -1. CSS is missing! That means two things: - * Either that you have wrongly set up the CSS URL in your templates, or - * your static generator has a configuration option that needs to be explicitly - set in order to serve static assets under a relative URL. - -[ci]: https://about.gitlab.com/gitlab-ci/ -[Jekyll]: http://jekyllrb.com/ -[install]: https://jekyllrb.com/docs/installation/ -[documentation]: https://jekyllrb.com/docs/home/ -[userpages]: https://docs.gitlab.com/ce/user/project/pages/introduction.html#user-or-group-pages -[projpages]: https://docs.gitlab.com/ce/user/project/pages/introduction.html#project-pages diff --git a/README.md b/README.md deleted file mode 100644 index ce5f93f..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -likebutter.app website diff --git a/_config.yml b/_config.yml index ce04b15..740065e 100644 --- a/_config.yml +++ b/_config.yml @@ -1,24 +1,36 @@ -# 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 need to edit after that. -# For technical reasons, this file is *NOT* reloaded automatically when you use -# 'jekyll serve'. If you change this file, please restart the server process. - -# Site settings -title: Like Butter... it's easy! -email: info@likebutter.app -description: > # this means to ignore newlines until "baseurl:" - A curated selection of apps to make life a little smoother offline. +title: Butter | Life without internet made smoother. +description: >- # this means to ignore newlines until "baseurl:" + Life without internet made smoother. Get access to tools that help. baseurl: "" # the subpath of your site, e.g. /blog -url: "/" # the base hostname & protocol for your site -twitter_username: jekyllrb -github_username: jekyll -gitlab_username: pages - -# Outputting -permalink: /:categories/:year/:month/:day/:title +url: "" # the base hostname & protocol for your site, e.g. http://example.com +twitter_username: Butter App +github_username: Butter App +logo: "/assets/images/butter-app-logo-small.svg" # Build settings -markdown: kramdown -exclude: ["README.md"] +sass: + sass_dir: _scss + style: compressed + +plugins: + - jekyll-feed + +# Exclude from processing. +# The following items will not be processed, by default. +# Any item listed under the `exclude:` key here will be automatically added to +# the internal "default list". +# +# Excluded items can be processed by explicitly listing the directories or +# their entries' file path in the `include:` list. +# +# exclude: +# - .sass-cache/ +# - .jekyll-cache/ +# - gemfiles/ +# - Gemfile +# - Gemfile.lock +# - node_modules/ +# - vendor/bundle/ +# - vendor/cache/ +# - vendor/gems/ +# - vendor/ruby/ diff --git a/_data/home.yml b/_data/home.yml new file mode 100644 index 0000000..c904807 --- /dev/null +++ b/_data/home.yml @@ -0,0 +1,31 @@ +page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo'] +title: 'Life without internet made smoother.
Get access to tools that help.' +text: | + The Butter app features a collection of apps to make life without
the internet a little smoother. + Use it to discover and download
free, ad-free apps or to spread the love and share apps offline. +button_text: 'Download Android App' +image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection'] + + +modal_data: + title: 'Butter: Free, ad-free apps to help you offline' + logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo'] + text: | + Be in-the-know, be entertained, manage business and life. All without the internet. + Butter is your link to offline essentials. This tiny app store features a collection of apps to make life without the internet a little smoother. + It takes minimal space on your phone, and is equipped with a nearby feature to send apps to friends offline. + info_list: + - By Guardian Project + - Version 2.0.1 + - Available for Android phones + button_text: 'Download Android App' + button_url: '#' + slider_list: + - '/assets/images/slide-img-1.png' + - '/assets/images/slide-img-2.png' + - '/assets/images/slide-img-3.png' + - '/assets/images/slide-img-4.png' + - '/assets/images/slide-img-5.png' + warning: | + You will need to enable downloads from unknown sources to install this app on your Android phone. + Learn more about Butter’s development team [guardianproject.info](guardianproject.info). diff --git a/_includes/footer.html b/_includes/footer.html index f4c956b..017c3bf 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,44 +1,7 @@ -