diff --git a/CNAME b/CNAME deleted file mode 100644 index fe9ba8f..0000000 --- a/CNAME +++ /dev/null @@ -1 +0,0 @@ -bugmark.net \ No newline at end of file diff --git a/Gemfile b/Gemfile index cef38ae..3505cfd 100644 --- a/Gemfile +++ b/Gemfile @@ -1,35 +1,12 @@ source "https://rubygems.org" -ruby "2.5.0" -# 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.7.3" - -# 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 - -gem 'json' require 'json' require 'open-uri' -versions = JSON.parse(open('https://pages.github.com/versions.json').read) -# gem 'github-pages', versions['github-pages'] -gem 'github-pages', :group => :jekyll_plugins +gem 'jekyll' +gem 'github-pages' +# gem "json", "2.0.2" -gem 'jekyll-sitemap' -gem 'jekyll-seo-tag' +group :jekyll_plugins do + gem 'jekyll-livereload' +end diff --git a/Gemfile.lock b/Gemfile.lock index 3f09cc8..f641f2d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.9) + activesupport (4.2.10) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -16,38 +16,40 @@ GEM commonmarker (0.17.9) ruby-enum (~> 0.5) concurrent-ruby (1.0.5) + dnsruby (1.61.1) + addressable (~> 2.5) em-websocket (0.5.1) eventmachine (>= 0.12.9) http_parser.rb (~> 0.6.0) ethon (0.11.0) ffi (>= 1.3.0) - eventmachine (1.2.5) + eventmachine (1.2.7) execjs (2.7.0) - faraday (0.14.0) + faraday (0.15.2) multipart-post (>= 1.2, < 3) - ffi (1.9.23) + ffi (1.9.25) forwardable-extended (2.6.0) gemoji (3.0.0) - github-pages (182) - activesupport (= 4.2.9) - github-pages-health-check (= 1.4.0) + github-pages (188) + activesupport (= 4.2.10) + github-pages-health-check (= 1.8.1) jekyll (= 3.7.3) - jekyll-avatar (= 0.5.0) + jekyll-avatar (= 0.6.0) jekyll-coffeescript (= 1.1.1) jekyll-commonmark-ghpages (= 0.1.5) jekyll-default-layout (= 0.1.4) - jekyll-feed (= 0.9.3) + jekyll-feed (= 0.10.0) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.9.4) - jekyll-mentions (= 1.3.0) + jekyll-mentions (= 1.4.0) jekyll-optional-front-matter (= 0.3.0) jekyll-paginate (= 1.1.0) jekyll-readme-index (= 0.2.0) - jekyll-redirect-from (= 0.13.0) + jekyll-redirect-from (= 0.14.0) jekyll-relative-links (= 0.5.3) - jekyll-remote-theme (= 0.2.3) + jekyll-remote-theme (= 0.3.1) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.4.0) + jekyll-seo-tag (= 2.5.0) jekyll-sitemap (= 1.2.0) jekyll-swiss (= 0.4.0) jekyll-theme-architect (= 0.1.1) @@ -64,22 +66,22 @@ GEM jekyll-theme-tactile (= 0.1.1) jekyll-theme-time-machine (= 0.1.1) jekyll-titles-from-headings (= 0.5.1) - jemoji (= 0.9.0) + jemoji (= 0.10.0) kramdown (= 1.16.2) liquid (= 4.0.0) listen (= 3.1.5) mercenary (~> 0.3) - minima (= 2.4.1) - nokogiri (>= 1.8.1, < 2.0) + minima (= 2.5.0) + nokogiri (>= 1.8.2, < 2.0) rouge (= 2.2.1) terminal-table (~> 1.4) - github-pages-health-check (1.4.0) + github-pages-health-check (1.8.1) addressable (~> 2.3) - net-dns (~> 0.8) + dnsruby (~> 1.60) octokit (~> 4.0) public_suffix (~> 2.0) typhoeus (~> 1.3) - html-pipeline (2.7.1) + html-pipeline (2.8.3) activesupport (>= 2) nokogiri (>= 1.4) http_parser.rb (0.6.0) @@ -98,7 +100,7 @@ GEM pathutil (~> 0.9) rouge (>= 1.7, < 4) safe_yaml (~> 1.0) - jekyll-avatar (0.5.0) + jekyll-avatar (0.6.0) jekyll (~> 3.0) jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) @@ -112,15 +114,17 @@ GEM rouge (~> 2) jekyll-default-layout (0.1.4) jekyll (~> 3.0) - jekyll-feed (0.9.3) + jekyll-feed (0.10.0) jekyll (~> 3.3) jekyll-gist (1.5.0) octokit (~> 4.2) jekyll-github-metadata (2.9.4) jekyll (~> 3.1) octokit (~> 4.0, != 4.4.0) - jekyll-mentions (1.3.0) - activesupport (~> 4.0) + jekyll-livereload (0.2.2) + em-websocket (~> 0.5) + jekyll (~> 3.0) + jekyll-mentions (1.4.0) html-pipeline (~> 2.3) jekyll (~> 3.0) jekyll-optional-front-matter (0.3.0) @@ -128,17 +132,16 @@ GEM jekyll-paginate (1.1.0) jekyll-readme-index (0.2.0) jekyll (~> 3.0) - jekyll-redirect-from (0.13.0) + jekyll-redirect-from (0.14.0) jekyll (~> 3.3) jekyll-relative-links (0.5.3) jekyll (~> 3.3) - jekyll-remote-theme (0.2.3) + jekyll-remote-theme (0.3.1) jekyll (~> 3.5) rubyzip (>= 1.2.1, < 3.0) - typhoeus (>= 0.7, < 2.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.4.0) + jekyll-seo-tag (2.5.0) jekyll (~> 3.3) jekyll-sitemap (1.2.0) jekyll (~> 3.3) @@ -187,12 +190,10 @@ GEM jekyll (~> 3.3) jekyll-watch (2.0.0) listen (~> 3.0) - jemoji (0.9.0) - activesupport (~> 4.0, >= 4.2.9) + jemoji (0.10.0) gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (~> 3.0) - json (2.1.0) kramdown (1.16.2) liquid (4.0.0) listen (3.1.5) @@ -201,16 +202,15 @@ GEM ruby_dep (~> 1.2) mercenary (0.3.6) mini_portile2 (2.3.0) - minima (2.4.1) + minima (2.5.0) jekyll (~> 3.5) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) minitest (5.11.3) multipart-post (2.0.0) - net-dns (0.8.0) - nokogiri (1.8.2) + nokogiri (1.8.4) mini_portile2 (~> 2.3.0) - octokit (4.8.0) + octokit (4.9.0) sawyer (~> 0.8.0, >= 0.5.3) pathutil (0.16.1) forwardable-extended (~> 2.6) @@ -239,22 +239,15 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.5) thread_safe (~> 0.1) - unicode-display_width (1.3.0) + unicode-display_width (1.4.0) PLATFORMS ruby DEPENDENCIES github-pages - jekyll (~> 3.7.3) - jekyll-feed (~> 0.6) - jekyll-seo-tag - jekyll-sitemap - json - minima (~> 2.0) - -RUBY VERSION - ruby 2.5.0p0 + jekyll + jekyll-livereload BUNDLED WITH 1.16.1 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 index 5e74065..1e83025 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ This is a Jekyll website mimicking the Minima theme, but using Bootstrap4. -Minima's wrapper is replaced by BootStrap's container, in order to use -Bootstrap's grid system and other features. +Minima's wrapper is replaced by BootStrap's container, in order to use Bootstrap's grid system and other features. See the [live website](http://bugmark.github.io/website/) on GitHub pages. + +To test this website locally : run ```jekyll serve``` in the repo dir. diff --git a/docs/_config.yml b/_config.yml old mode 100644 new mode 100755 similarity index 57% rename from docs/_config.yml rename to _config.yml index bf6e239..2055d10 --- a/docs/_config.yml +++ b/_config.yml @@ -1,13 +1,34 @@ title: Bugmark +authors: + snehasi: + name: Sneha Sinha + display_name: snehasi + email: ssinha@mozilla.com + twitter: sneha_si42 + github: snehasi + andyl: + name: Andy Leak + display_name: andyl + email: andy@r210.com + twitter: akleak + github: andyl + cynthiapereira: + name: Cynthia Pereira dev_email: andy@r210.com email: getbugmark@gmail.com description: "Bugmark Information" -url: https://bugmark.net +baseurl: /website +url: https://snehasi.github.io twitter_username: getbugmark github_username: bugmark +livereload: true # Build settings -markdown: kramdown +sass: + sass_dir: _sass +include: ['_pages'] +kramdown: + input: GFM theme: minima plugins: - jekyll-feed @@ -31,11 +52,9 @@ paginate: 1 sass: sass_dir: _sass style: :compressed -author: Bugmark +author: Bugmark analytics_id: TBD disqus: shortname: TBD - -excerpt_separator: diff --git a/docs/_includes/footer.html b/_includes/footer.html old mode 100644 new mode 100755 similarity index 53% rename from docs/_includes/footer.html rename to _includes/footer.html index c3e7550..3c5f11e --- a/docs/_includes/footer.html +++ b/_includes/footer.html @@ -1,25 +1,28 @@ -