From 9db05d6900735e3c58957370ef4874d6a1e76857 Mon Sep 17 00:00:00 2001 From: haade <76404800+haade-administrator@users.noreply.github.com> Date: Wed, 6 Oct 2021 15:34:28 +0200 Subject: [PATCH 01/17] update --- _config.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/_config.yml b/_config.yml index 2dbd79fa0..3ad187a47 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,7 @@ -title: "Affiliates" -email: wowthemesnet@gmail.com -timezone: UTC -baseurl: "/affiliates-jekyll-theme" +title: "Haade" +email: administrateur@haade.fr +timezone: Europe/Paris +baseurl: "/haade" permalink: "/:title/" logo: 'assets/images/logo.png' favicon: 'assets/images/favicon.ico' @@ -24,23 +24,24 @@ ganalytics: UA-113961478-1 # Authors authors: - sal: - name: Sal - display_name: Sal - avatar: 'assets/images/sal.png' - email: wowthemesnet@gmail.com + nico: + name: Nico + display_name: Nico + avatar: 'assets/images/nico.png' + gravatar: 66178447db0764d08b4bd975c515fa5d + email: nico@haade.fr web: https://www.wowthemes.net/category/jekyll-themes/ twitter: https://twitter.com/wowthemesnet - description: "Author of Affiliates, a template available for WordPress, HTML, Ghost and Jekyll. You are currently previewing Jekyll template demo." - john: - name: John - display_name: John - avatar: 'assets/images/john.png' + description: "Admirateur en domotique, spécialisée en montage Diy sur Home-Assistant, Jeedom et Openhab, montez votre réseau en Zigbee ou Z-wave à moindre prix." + yann: + name: Yann + display_name: Yann + avatar: 'assets/images/yann.png' + gravatar: b1cc14991db7a456fcd761680bbc8f81 email: wowthemesnet@gmail.com web: https://www.wowthemes.net/category/jekyll-themes/ twitter: https://twitter.com/wowthemesnet description: "This is the author box. Write a short description of the author here. You are currently previewing Affiliates theme demo, a Jekyll template compatible with Github pages." - # Social social: instagram: https://www.instagram.com/bootstrapstarter/ @@ -53,4 +54,4 @@ plugins: - jekyll-sitemap - jekyll-feed - jekyll-seo-tag -- jekyll-archives \ No newline at end of file +- jekyll-archives From 9bac256ae39d51f633380e90cc40463c774c5c21 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Wed, 6 Oct 2021 15:42:49 +0200 Subject: [PATCH 02/17] new site --- _config.yml | 3 ++- _includes/postbox.html | 18 ++++++++++--- _layouts/post.html | 28 +++++++++++++++++---- _posts/2020-01-12-red-riding.md | 2 +- _posts/2020-01-12-we-all-wait-for-summer.md | 3 ++- assets/css/theme.scss | 2 +- 6 files changed, 43 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index 3ad187a47..2c64b9fce 100644 --- a/_config.yml +++ b/_config.yml @@ -5,7 +5,7 @@ baseurl: "/haade" permalink: "/:title/" logo: 'assets/images/logo.png' favicon: 'assets/images/favicon.ico' -author: Sal +author: Nico paginate: 30 disqus: 'demowebsite' locale: en_us @@ -42,6 +42,7 @@ authors: web: https://www.wowthemes.net/category/jekyll-themes/ twitter: https://twitter.com/wowthemesnet description: "This is the author box. Write a short description of the author here. You are currently previewing Affiliates theme demo, a Jekyll template compatible with Github pages." + # Social social: instagram: https://www.instagram.com/bootstrapstarter/ diff --git a/_includes/postbox.html b/_includes/postbox.html index 003cdac62..ec4f4b5a8 100644 --- a/_includes/postbox.html +++ b/_includes/postbox.html @@ -9,13 +9,23 @@

{{

{{ post.excerpt | strip_html | truncatewords:15 }}

+ {% if post.author %} + + {% if author.avatar %} + {{ author.display_name }} + {% else %} + {{ author.display_name }} + {% endif %} + - By {% if post.author %}{{ author.display_name }}{% else %}{{ site.author }}{% endif %}, - on {{ post.date | date_to_string }} - + {{ author.display_name }} + {% endif %} + {{ post.date | date_to_string }} + +
- \ No newline at end of file + diff --git a/_layouts/post.html b/_layouts/post.html index ec1ae27f7..cd15a36f3 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -15,10 +15,28 @@ {% assign author = site.authors[page.author] %}
- - {% if page.image %}{{ page.title }}{% endif %} - -
+
+ + + {% if page.author %} +
+
+ {% if author.avatar %} + {{ author.display_name }} + {% else %} + {{ author.display_name }} + {% endif %} +
+
+ {{ author.display_name }} + {{ author.description }} +
+
+ {% endif %} + + + {% if page.image %}{{ page.title }}{% endif %} +
@@ -116,4 +134,4 @@

{{ page.title }}

\ No newline at end of file +================================================== --> diff --git a/_posts/2020-01-12-red-riding.md b/_posts/2020-01-12-red-riding.md index af274519c..2f377dd42 100644 --- a/_posts/2020-01-12-red-riding.md +++ b/_posts/2020-01-12-red-riding.md @@ -1,7 +1,7 @@ --- layout: post title: "Red Riding Hood" -author: sal +author: nico categories: [ Jekyll, tutorial ] image: assets/images/3.jpg --- diff --git a/_posts/2020-01-12-we-all-wait-for-summer.md b/_posts/2020-01-12-we-all-wait-for-summer.md index 6b0f4991a..d48984687 100644 --- a/_posts/2020-01-12-we-all-wait-for-summer.md +++ b/_posts/2020-01-12-we-all-wait-for-summer.md @@ -1,9 +1,10 @@ --- layout: post title: "We all wait for summer" +author: nico categories: [ Jekyll, tutorial ] image: assets/images/1.jpg --- This is changed. As I engage in the so-called "bull sessions" around and about the school, I too often find that most college men have a misconception of the purpose of education. Most of the "brethren" think that education should equip them with the proper instruments of exploitation so that they can forever trample over the masses. Still others think that education should furnish them with noble ends rather than means to an end. -It seems to me that education has a two-fold function to perform in the life of man and in society: the one is utility and the other is culture. Education must enable a man to become more efficient, to achieve with increasing facility the ligitimate goals of his life. \ No newline at end of file +It seems to me that education has a two-fold function to perform in the life of man and in society: the one is utility and the other is culture. Education must enable a man to become more efficient, to achieve with increasing facility the ligitimate goals of his life. diff --git a/assets/css/theme.scss b/assets/css/theme.scss index 8e1bb07c3..127c91f8f 100644 --- a/assets/css/theme.scss +++ b/assets/css/theme.scss @@ -273,11 +273,11 @@ span.post-read-more a { height: 30px; line-height: 30px; text-align: center; - border: 1px solid #d0d0d0; border-radius: 50%; } span.post-name a,span.post-read-more a:hover { color:rgba(0,0,0,.8); + font-weight: bold; } .dot:after { content:"·"; From a1539fe538966d0ec493acd053965278fb00cc1c Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Wed, 6 Oct 2021 15:46:04 +0200 Subject: [PATCH 03/17] change avatar --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index 2c64b9fce..0bd58005c 100644 --- a/_config.yml +++ b/_config.yml @@ -27,7 +27,6 @@ authors: nico: name: Nico display_name: Nico - avatar: 'assets/images/nico.png' gravatar: 66178447db0764d08b4bd975c515fa5d email: nico@haade.fr web: https://www.wowthemes.net/category/jekyll-themes/ From 4d6d238ca0342358bda695afe76d2832749d583a Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Wed, 6 Oct 2021 16:07:14 +0200 Subject: [PATCH 04/17] change --- _data/menus.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_data/menus.yml b/_data/menus.yml index 8435b7efc..5103b1f89 100644 --- a/_data/menus.yml +++ b/_data/menus.yml @@ -26,7 +26,3 @@ footermenu: - title: Contact url: "contact/" - -- title: Download - url: https://bootstrapstarter.com/template-affiliates-bootstrap-jekyll/ - external: true \ No newline at end of file From e29e24e9cd0b1c5bebec733710c5ca67e6a5928d Mon Sep 17 00:00:00 2001 From: haade <76404800+haade-administrator@users.noreply.github.com> Date: Wed, 6 Oct 2021 17:28:01 +0200 Subject: [PATCH 05/17] Update _config.yml --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 0bd58005c..25ad9a954 100644 --- a/_config.yml +++ b/_config.yml @@ -1,7 +1,7 @@ title: "Haade" email: administrateur@haade.fr timezone: Europe/Paris -baseurl: "/haade" +baseurl: "/" permalink: "/:title/" logo: 'assets/images/logo.png' favicon: 'assets/images/favicon.ico' From ea1ed9879ada67174eeb0180bcb495c41e79fc83 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 7 Oct 2021 07:43:40 +0200 Subject: [PATCH 06/17] suite --- _data/menus.yml | 12 ++++++++---- index.html | 10 ++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/_data/menus.yml b/_data/menus.yml index 5103b1f89..033be53bd 100644 --- a/_data/menus.yml +++ b/_data/menus.yml @@ -10,10 +10,10 @@ topmenu: - title: Contact url: "contact/" -- title: Get this theme - url: https://bootstrapstarter.com/template-affiliates-bootstrap-jekyll/ - class: "ml-2 btn btn-dark text-white px-3" - external: true +#- title: Get this theme +# url: https://bootstrapstarter.com/template-affiliates-bootstrap-jekyll/ +# class: "ml-2 btn btn-dark text-white px-3" +# external: true # Footer Menu footermenu: @@ -26,3 +26,7 @@ footermenu: - title: Contact url: "contact/" + +#- title: Download +# url: google.fr/ +# external: true diff --git a/index.html b/index.html index 011e1fdcd..33ffef189 100644 --- a/index.html +++ b/index.html @@ -4,8 +4,10 @@ background: '/img/bg-index.jpg' --- +{% if page.url == "/" %} + +================================================== {% if page.url == "/" %}
@@ -19,16 +21,16 @@

Let me teach you how to become suc

-{% endif %} +{% endif %} -->
{% for post in site.posts %} {% if post.featured == true %} -
+ {% include postbox.html %} -
+ {% endif %} {% endfor %}
From 3f55db499688fef2d352d0622f1d02333417d4fb Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 7 Oct 2021 07:47:37 +0200 Subject: [PATCH 07/17] erreur --- index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.html b/index.html index 33ffef189..f3d037cda 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,7 @@

Let me teach you how to become suc {% endif %} {% endfor %} -

+ --> {% if page.url == "/" %}
@@ -21,19 +20,19 @@

Let me teach you how to become suc

-{% endif %} --> +{% endif %}
{% for post in site.posts %} {% if post.featured == true %} - +
{% include postbox.html %} - +
{% endif %} {% endfor %} - --> +
- - + + {% assign author = site.authors[page.author] %} - +
-
- - - {% if page.author %} -
-
- {% if author.avatar %} - {{ author.display_name }} - {% else %} - {{ author.display_name }} - {% endif %} -
-
- {{ author.display_name }} - {{ author.description }} -
-
- {% endif %} +
{% if page.image %}{{ page.title }}{% endif %} - - + + +

Cet article prendra {{ content | reading_time | pluralize: "minute" }} à lire.

+ + +
    @@ -50,13 +37,13 @@
- + -

{{ page.title }}

- +

{{ page.title }}

+
- +
@@ -67,15 +54,15 @@

{{ page.title }}

- + {% if page.last_modified_at %} (Updated: ) {% endif %}

- - - + + +
{% if page.previous.url %} @@ -90,46 +77,50 @@

{{ page.title }}

{% endif %}
- - - - {% if page.author %} -
-
- {{ author.display_name }} -
-
- {{ author.display_name }} - {{ author.description }} -
-
- {% endif %} - - + + + + {% if page.author %} +
+
+ {% if author.avatar %} + {{ author.display_name }} + {% else %} + {{ author.display_name }} + {% endif %} +
+
+ {{ author.display_name }} + {{ author.description }} +
+
+ {% endif %} + +
-
- {% include disqus.html %} +
+ {% include disqus.html %}
- - + +
- +
{% include sidebar.html %}
- - + +
diff --git a/assets/css/theme.scss b/assets/css/theme.scss index 127c91f8f..619ad48d0 100644 --- a/assets/css/theme.scss +++ b/assets/css/theme.scss @@ -15,7 +15,7 @@ $blue: #3d61fd !default; html { scroll-behavior: smooth; } - + body { background:#fff; font-size:17px; @@ -25,7 +25,7 @@ body { color: #333; overflow-x:hidden; padding-top:116px; - + } .serif-font { font-family:PT Serif; @@ -88,22 +88,22 @@ small, .small { .start-header { opacity: 1; transform: translateY(0); - padding: 20px 0; + padding: 20px 0; -webkit-transition : all 0.3s ease-out; transition : all 0.3s ease-out; - + } -.start-header.scroll-on { +.start-header.scroll-on { padding: 5px 0; -webkit-transition : all 0.3s ease-out; transition : all 0.3s ease-out; box-shadow: 0px 10px 40px 0px rgba(0,0,0,0.05); } -.start-header.scroll-on .navbar-brand img { +.start-header.scroll-on .navbar-brand img { -webkit-transition : all 0.3s ease-out; transition : all 0.3s ease-out; } -.navigation-wrap { +.navigation-wrap { width: 100%; top: 0; left: 0; @@ -160,7 +160,7 @@ small, .small { } .google-auto-placed { margin-bottom:2rem; -} +} .comma:last-child { display:none; } @@ -203,7 +203,7 @@ small, .small { } .layout-page .section-title h2:before {top:17px;} .article-post ol, .article-post ul { margin-bottom:1.5rem;} -.article-post ol ol, .article-post ul ul { +.article-post ol ol, .article-post ul ul { list-style: disc; margin-bottom:0rem; } @@ -302,9 +302,9 @@ span.post-name a,span.post-read-more a:hover { font-size:15px; } a { - color:inherit; + color:inherit; box-shadow:inset 0 -2px 0 rgba(255, 229, 31,1), 0 2px 0 rgba(255, 229, 31,1); - + } a:hover { box-shadow:inset 0 -30px 0 rgba(255, 229, 31,1), 0 2px 0 rgba(255, 229, 31,1); @@ -325,7 +325,7 @@ blockquote { } .featured-image { display: block; - margin-bottom: 2rem; + margin-bottom: 0.9rem; } .full-width { @@ -349,7 +349,7 @@ blockquote { } -.card { +.card { border:0; } .card .img-thumb { @@ -371,7 +371,7 @@ ul.tags li a { border-radius: 3px; font-weight: 500; background:#eee; - text-transform: capitalize; + text-transform: capitalize; box-shadow: 0 6px 10px 0 rgba(169, 169, 169, 0.1); } ul.tags li a:hover { @@ -512,7 +512,7 @@ background-color: #fff; padding-bottom: 7px; padding-top: 7px; } -.sidebar-section { +.sidebar-section { margin-bottom: 2rem; box-shadow:0 0px 1px 0 rgba(0, 0, 0, 0.44); padding: 30px; @@ -531,7 +531,7 @@ background-color: #fff; font-weight: 400; font-size: 15px; color: #999; - margin-bottom: 1rem; + margin-bottom: 1rem; line-height: 1.5; text-align: center; } diff --git a/index.html b/index.html index 3cd3dbaa5..bc1a9dc99 100644 --- a/index.html +++ b/index.html @@ -7,16 +7,16 @@ -{% if page.url == "/" %} +{% if page.url == "/" %}
-

Let me teach you how to become successful online

+

Le me teach you how to become successful online

My name is Lyam and I'm here to share with you my knowledge and experience of over 10 years of monetizing my blog.

About me
- +
@@ -27,12 +27,11 @@

Let me teach you how to become suc
{% for post in site.posts %} {% if post.featured == true %} -
+
{% include postbox.html %} -
+
{% endif %} {% endfor %} -

-

Cet article prendra {{ content | reading_time | pluralize: "minute" }} à lire.

- - -
    From 1e6a03fe6b91897b0e7e334985892f7b01988b05 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 7 Oct 2021 09:53:31 +0200 Subject: [PATCH 15/17] ajout admin --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index e729c5b54..7dffbb0b6 100644 --- a/Gemfile +++ b/Gemfile @@ -13,6 +13,7 @@ source "https://rubygems.org" # If you have any plugins, put them here! gem 'wdm', '>= 0.1.0' if Gem.win_platform? group :jekyll_plugins do + gem 'jekyll-admin' gem 'jekyll-feed' gem 'jekyll-sitemap' gem 'jekyll-paginate' From a1b46238691667dfdfdbf61dad53063caee73db5 Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 7 Oct 2021 09:58:22 +0200 Subject: [PATCH 16/17] ajout --- _config.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/_config.yml b/_config.yml index 363b982b0..c8a291ac1 100644 --- a/_config.yml +++ b/_config.yml @@ -48,6 +48,16 @@ social: facebook: https://www.facebook.com/bootstrapstartercom-346329609045284 twitter: https://twitter.com/bstartercom +# Admin +jekyll_admin: + hidden_links: + - posts + - pages + - staticfiles + - datafiles + - configuration + homepage: "pages" + # Plugins plugins: - jekyll-paginate @@ -55,3 +65,5 @@ plugins: - jekyll-feed - jekyll-seo-tag - jekyll-archives + + From 813e421dfceb6dc68faedade8db1a5c65ca0a66f Mon Sep 17 00:00:00 2001 From: Nicolas Rodriguez Date: Thu, 7 Oct 2021 15:47:45 +0200 Subject: [PATCH 17/17] large --- assets/css/theme.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/css/theme.scss b/assets/css/theme.scss index 619ad48d0..5ba97cb3a 100644 --- a/assets/css/theme.scss +++ b/assets/css/theme.scss @@ -30,7 +30,7 @@ body { .serif-font { font-family:PT Serif; } -@media (max-width: 1366px) { +@media (max-width: 1654px) { .container-xl, .container-lg, .container-md, .container-sm, .container { width:90%; max-width:90%;