From 5f1779c898051d7b746f3051ca751159635bdca6 Mon Sep 17 00:00:00 2001 From: Valentin Valchev Date: Tue, 25 Apr 2023 17:29:48 +0300 Subject: [PATCH 1/2] Upgraded to Creative Theme v7.0.7 and Bootstrap v5.2.3. --- .gitignore | 1 + Gemfile | 10 +- Gemfile.lock | 214 +- README.md | 4 +- _config.yml | 1 + _includes/actions.html | 2 +- _includes/address.html | 14 +- _includes/aside.html | 2 +- _includes/call-to-action.html | 6 +- _includes/contact.html | 19 +- _includes/footer.html | 2 +- _includes/members.html | 4 +- _includes/nav.html | 26 +- _includes/paragraph.html | 4 +- _includes/portfolio.html | 20 +- _includes/services.html | 10 +- _includes/timeline.html | 2 +- _layouts/base.html | 79 +- _layouts/home.html | 26 +- _layouts/page.html | 8 +- assets/css/creative.scss | 10148 ----------------------------- assets/css/styles.css | 10995 ++++++++++++++++++++++++++++++++ assets/{img => }/favicon.ico | Bin assets/js/creative.js | 63 - assets/js/creative.min.js | 1 - assets/js/scripts.js | 59 + assets/js/scripts.min.js | 1 + build-in-docker.sh | 11 +- index.md | 22 +- 29 files changed, 11295 insertions(+), 10459 deletions(-) delete mode 100644 assets/css/creative.scss create mode 100644 assets/css/styles.css rename assets/{img => }/favicon.ico (100%) delete mode 100644 assets/js/creative.js delete mode 100644 assets/js/creative.min.js create mode 100644 assets/js/scripts.js create mode 100644 assets/js/scripts.min.js diff --git a/.gitignore b/.gitignore index 2d2eb810fc..b6cd6c15ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ _site/ .sass-cache/ .DS_Store +/vendor/ diff --git a/Gemfile b/Gemfile index 8a77ea8f90..1cd82ed7d1 100644 --- a/Gemfile +++ b/Gemfile @@ -1,10 +1,10 @@ source "https://rubygems.org" -git_source(:github) {|repo_name| "https://github.com/#{repo_name}" } - -gem "github-pages", "= 209" +gem "github-pages", "~> 227", group: :jekyll_plugins +gem "webrick", "~> 1.8" group :jekyll_plugins do - gem "jekyll-sitemap", "= 1.4.0" - gem "jekyll-seo-tag", "= 2.6.1" + gem "jekyll-sitemap", "~> 1.4.0" + gem "jekyll-seo-tag", "~> 2.8.0" end + diff --git a/Gemfile.lock b/Gemfile.lock index 2253a60b60..6621f88b37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,94 +1,95 @@ GEM remote: https://rubygems.org/ specs: - activesupport (6.0.3.4) + activesupport (6.0.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) - addressable (2.7.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.11.1) colorator (1.1.0) - commonmarker (0.17.13) - ruby-enum (~> 0.5) - concurrent-ruby (1.1.7) - dnsruby (1.61.5) + commonmarker (0.23.6) + concurrent-ruby (1.1.10) + dnsruby (1.61.9) simpleidn (~> 0.1) - em-websocket (0.5.2) + em-websocket (0.5.3) eventmachine (>= 0.12.9) - http_parser.rb (~> 0.6.0) - ethon (0.12.0) - ffi (>= 1.3.0) + http_parser.rb (~> 0) + ethon (0.16.0) + ffi (>= 1.15.0) eventmachine (1.2.7) - execjs (2.7.0) - faraday (1.1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords - ffi (1.13.1) + execjs (2.8.1) + faraday (2.6.0) + faraday-net_http (>= 2.0, < 3.1) + ruby2_keywords (>= 0.0.4) + faraday-net_http (3.0.1) + ffi (1.15.5) forwardable-extended (2.6.0) gemoji (3.0.1) - github-pages (209) - github-pages-health-check (= 1.16.1) - jekyll (= 3.9.0) + github-pages (227) + github-pages-health-check (= 1.17.9) + jekyll (= 3.9.2) jekyll-avatar (= 0.7.0) jekyll-coffeescript (= 1.1.1) - jekyll-commonmark-ghpages (= 0.1.6) + jekyll-commonmark-ghpages (= 0.2.0) jekyll-default-layout (= 0.1.4) jekyll-feed (= 0.15.1) jekyll-gist (= 1.5.0) jekyll-github-metadata (= 2.13.0) + jekyll-include-cache (= 0.2.1) jekyll-mentions (= 1.6.0) jekyll-optional-front-matter (= 0.3.2) jekyll-paginate (= 1.1.0) jekyll-readme-index (= 0.3.0) jekyll-redirect-from (= 0.16.0) jekyll-relative-links (= 0.6.1) - jekyll-remote-theme (= 0.4.2) + jekyll-remote-theme (= 0.4.3) jekyll-sass-converter (= 1.5.2) - jekyll-seo-tag (= 2.6.1) + jekyll-seo-tag (= 2.8.0) jekyll-sitemap (= 1.4.0) jekyll-swiss (= 1.0.0) - jekyll-theme-architect (= 0.1.1) - jekyll-theme-cayman (= 0.1.1) - jekyll-theme-dinky (= 0.1.1) - jekyll-theme-hacker (= 0.1.2) - jekyll-theme-leap-day (= 0.1.1) - jekyll-theme-merlot (= 0.1.1) - jekyll-theme-midnight (= 0.1.1) - jekyll-theme-minimal (= 0.1.1) - jekyll-theme-modernist (= 0.1.1) - jekyll-theme-primer (= 0.5.4) - jekyll-theme-slate (= 0.1.1) - jekyll-theme-tactile (= 0.1.1) - jekyll-theme-time-machine (= 0.1.1) + jekyll-theme-architect (= 0.2.0) + jekyll-theme-cayman (= 0.2.0) + jekyll-theme-dinky (= 0.2.0) + jekyll-theme-hacker (= 0.2.0) + jekyll-theme-leap-day (= 0.2.0) + jekyll-theme-merlot (= 0.2.0) + jekyll-theme-midnight (= 0.2.0) + jekyll-theme-minimal (= 0.2.0) + jekyll-theme-modernist (= 0.2.0) + jekyll-theme-primer (= 0.6.0) + jekyll-theme-slate (= 0.2.0) + jekyll-theme-tactile (= 0.2.0) + jekyll-theme-time-machine (= 0.2.0) jekyll-titles-from-headings (= 0.5.3) jemoji (= 0.12.0) - kramdown (= 2.3.0) + kramdown (= 2.3.2) kramdown-parser-gfm (= 1.1.0) liquid (= 4.0.3) mercenary (~> 0.3) minima (= 2.5.1) - nokogiri (>= 1.10.4, < 2.0) - rouge (= 3.23.0) + nokogiri (>= 1.13.6, < 2.0) + rouge (= 3.26.0) terminal-table (~> 1.4) - github-pages-health-check (1.16.1) + github-pages-health-check (1.17.9) addressable (~> 2.3) dnsruby (~> 1.60) octokit (~> 4.0) - public_suffix (~> 3.0) + public_suffix (>= 3.0, < 5.0) typhoeus (~> 1.3) - html-pipeline (2.14.0) + html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) - http_parser.rb (0.6.0) + http_parser.rb (0.8.0) i18n (0.9.5) concurrent-ruby (~> 1.0) - jekyll (3.9.0) + jekyll (3.9.2) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -106,12 +107,12 @@ GEM jekyll-coffeescript (1.1.1) coffee-script (~> 2.2) coffee-script-source (~> 1.11.1) - jekyll-commonmark (1.3.1) - commonmarker (~> 0.14) - jekyll (>= 3.7, < 5.0) - jekyll-commonmark-ghpages (0.1.6) - commonmarker (~> 0.17.6) - jekyll-commonmark (~> 1.2) + jekyll-commonmark (1.4.0) + commonmarker (~> 0.22) + jekyll-commonmark-ghpages (0.2.0) + commonmarker (~> 0.23.4) + jekyll (~> 3.9.0) + jekyll-commonmark (~> 1.4.0) rouge (>= 2.0, < 4.0) jekyll-default-layout (0.1.4) jekyll (~> 3.0) @@ -122,6 +123,8 @@ GEM jekyll-github-metadata (2.13.0) jekyll (>= 3.4, < 5.0) octokit (~> 4.0, != 4.4.0) + jekyll-include-cache (0.2.1) + jekyll (>= 3.7, < 5.0) jekyll-mentions (1.6.0) html-pipeline (~> 2.3) jekyll (>= 3.7, < 5.0) @@ -134,57 +137,57 @@ GEM jekyll (>= 3.3, < 5.0) jekyll-relative-links (0.6.1) jekyll (>= 3.3, < 5.0) - jekyll-remote-theme (0.4.2) + jekyll-remote-theme (0.4.3) addressable (~> 2.0) jekyll (>= 3.5, < 5.0) jekyll-sass-converter (>= 1.0, <= 3.0.0, != 2.0.0) rubyzip (>= 1.3.0, < 3.0) jekyll-sass-converter (1.5.2) sass (~> 3.4) - jekyll-seo-tag (2.6.1) - jekyll (>= 3.3, < 5.0) + jekyll-seo-tag (2.8.0) + jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) jekyll (>= 3.7, < 5.0) jekyll-swiss (1.0.0) - jekyll-theme-architect (0.1.1) - jekyll (~> 3.5) + jekyll-theme-architect (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-cayman (0.1.1) - jekyll (~> 3.5) + jekyll-theme-cayman (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-dinky (0.1.1) - jekyll (~> 3.5) + jekyll-theme-dinky (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-hacker (0.1.2) + jekyll-theme-hacker (0.2.0) jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-leap-day (0.1.1) - jekyll (~> 3.5) + jekyll-theme-leap-day (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-merlot (0.1.1) - jekyll (~> 3.5) + jekyll-theme-merlot (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-midnight (0.1.1) - jekyll (~> 3.5) + jekyll-theme-midnight (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-minimal (0.1.1) - jekyll (~> 3.5) + jekyll-theme-minimal (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-modernist (0.1.1) - jekyll (~> 3.5) + jekyll-theme-modernist (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-primer (0.5.4) + jekyll-theme-primer (0.6.0) jekyll (> 3.5, < 5.0) jekyll-github-metadata (~> 2.9) jekyll-seo-tag (~> 2.0) - jekyll-theme-slate (0.1.1) - jekyll (~> 3.5) + jekyll-theme-slate (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-tactile (0.1.1) - jekyll (~> 3.5) + jekyll-theme-tactile (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) - jekyll-theme-time-machine (0.1.1) - jekyll (~> 3.5) + jekyll-theme-time-machine (0.2.0) + jekyll (> 3.5, < 5.0) jekyll-seo-tag (~> 2.0) jekyll-titles-from-headings (0.5.3) jekyll (>= 3.3, < 5.0) @@ -194,70 +197,69 @@ GEM gemoji (~> 3.0) html-pipeline (~> 2.2) jekyll (>= 3.0, < 5.0) - kramdown (2.3.0) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.3) - listen (3.3.3) + listen (3.7.1) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) mercenary (0.3.6) - mini_portile2 (2.4.0) minima (2.5.1) jekyll (>= 3.5, < 5.0) jekyll-feed (~> 0.9) jekyll-seo-tag (~> 2.1) - minitest (5.14.2) - multipart-post (2.1.1) - nokogiri (1.10.10) - mini_portile2 (~> 2.4.0) - octokit (4.19.0) - faraday (>= 0.9) - sawyer (~> 0.8.0, >= 0.5.3) + minitest (5.15.0) + nokogiri (1.13.9-x86_64-linux) + racc (~> 1.4) + octokit (4.25.1) + faraday (>= 1, < 3) + sawyer (~> 0.9) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (3.1.1) - rb-fsevent (0.10.4) + public_suffix (4.0.7) + racc (1.6.0) + rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) - rexml (3.2.4) - rouge (3.23.0) - ruby-enum (0.8.0) - i18n - ruby2_keywords (0.0.2) - rubyzip (2.3.0) + rexml (3.2.5) + rouge (3.26.0) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) safe_yaml (1.0.5) sass (3.7.4) sass-listen (~> 4.0.0) sass-listen (4.0.0) rb-fsevent (~> 0.9, >= 0.9.4) rb-inotify (~> 0.9, >= 0.9.7) - sawyer (0.8.2) + sawyer (0.9.2) addressable (>= 2.3.5) - faraday (> 0.8, < 2.0) - simpleidn (0.1.1) + faraday (>= 0.17.3, < 3) + simpleidn (0.2.1) unf (~> 0.1.4) terminal-table (1.8.0) unicode-display_width (~> 1.1, >= 1.1.1) thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.8) + tzinfo (1.2.10) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.7) - unicode-display_width (1.7.0) - zeitwerk (2.4.2) + unf_ext (0.0.8.2) + unicode-display_width (1.8.0) + webrick (1.8.1) + zeitwerk (2.6.6) PLATFORMS - ruby + x86_64-linux-musl DEPENDENCIES - github-pages (= 209) - jekyll-seo-tag (= 2.6.1) - jekyll-sitemap (= 1.4.0) + github-pages (~> 227) + jekyll-seo-tag (~> 2.8.0) + jekyll-sitemap (~> 1.4.0) + webrick (~> 1.8) BUNDLED WITH - 2.1.4 + 2.3.25 diff --git a/README.md b/README.md index 59f5195e4e..1114b7c8c9 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ A Jekyll implementation of the [Creative Theme](https://startbootstrap.com/theme An attractive one page Bootstrap theme perfect for creative portfolios and businesses -Based on Creative Theme v6.0.4 and Bootstrap v4.5.3. +Based on Creative Theme v7.0.7 and Bootstrap v5.2.3. ## To use the Creative Theme template in your project @@ -28,7 +28,7 @@ Creating a site with this particular Jekyll theme, is basically writing a markdo If you want to use this template, or enhance it, you can use Docker. Just run './build-in-docker.sh' and then point your browser to http://localhost:4000/. -Note: Developing for github pages is tricky. You should alway rely on +Note: Developing for github pages is tricky. You should always rely on [safe plugins](https://pages.github.com/versions/) because any other, that's not in the list will simply not run. diff --git a/_config.yml b/_config.yml index c26ff86f8a..61a46a523f 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,7 @@ # Site settings title: Your Title Here description: > # this means to ignore newlines until "baseurl:" +repository: vvalchev/creative-theme-jekyll-new baseurl: "/creative-theme-jekyll-new/" # the subpath of your site, e.g. /blog/ url: "" # the base hostname & protocol for your site author: Copyright © 2019 - Start Bootstrap diff --git a/_includes/actions.html b/_includes/actions.html index c58cd0d67f..1b31769e08 100644 --- a/_includes/actions.html +++ b/_includes/actions.html @@ -1,5 +1,5 @@ {% if include.actions %} -
+
{% for action in include.actions %} {{ action.title }} diff --git a/_includes/address.html b/_includes/address.html index 01ec4133eb..6b2bb1b1e6 100644 --- a/_includes/address.html +++ b/_includes/address.html @@ -1,24 +1,24 @@
-
-
-
+
+
+

{{ section.title }}

{{ section.text }}

-
+
-
+
    -
  • +

  • {{ section.address.title }}

    {{ section.address.text }}


    • -
  • +

  • {{ section.phone.title }}

    {{ section.phone.text }}


    diff --git a/_includes/aside.html b/_includes/aside.html index f221404dfc..de0e2145e5 100644 --- a/_includes/aside.html +++ b/_includes/aside.html @@ -1,5 +1,5 @@
    -
    +

    {{ section.title }}!

    {% include actions.html actions=section.actions %}
    diff --git a/_includes/call-to-action.html b/_includes/call-to-action.html index a273d42fce..865ec1cfb8 100644 --- a/_includes/call-to-action.html +++ b/_includes/call-to-action.html @@ -1,7 +1,7 @@
    -
    -
    -
    +
    +
    +

    {{ section.title }}

    {{ section.text | markdownify }}
    diff --git a/_includes/contact.html b/_includes/contact.html index 865a3a9409..d82bd71828 100644 --- a/_includes/contact.html +++ b/_includes/contact.html @@ -1,17 +1,16 @@
    -
    -
    -
    -

    {{ section.title }}

    -
    -

    {{ section.text }}

    -
    +
    +
    +
    +

    {{ section.title }}

    +
    +

    {{ section.text }}

    +
    -
    +
    {% for action in section.actions %} - {% assign fa = action.icon_type | default: "fas" %}
    - + {{ action.title }}
    {% endfor %} diff --git a/_includes/footer.html b/_includes/footer.html index ddef39b5bc..168326eaf4 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,6 +1,6 @@