From 4c2286457d94300afdee43ecbfc49c88ef5f36bf Mon Sep 17 00:00:00 2001 From: KingFelix Date: Mon, 4 May 2015 21:11:26 +0200 Subject: [PATCH 01/13] Update the readme file --- readme.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/readme.md b/readme.md index c1dfb775ff..f2914eaf8d 100644 --- a/readme.md +++ b/readme.md @@ -10,6 +10,23 @@ After extracting the content from the folder into the selected directory, you ca Additionally it is possible to fork the repository and use Github Pages as hosting. By following this way it will be enough to change the ``baseurl`` value into the ``_config.yml`` file, with the directory name of your project (for example /blog) or simply with a "/" (slash) if you want install Emerald in the root. +### Options +Starting from the 1.1.0 version, you can customize Emerald thanks to a few options. Now it is possible to set a custom header by setting the related option in the ``_config.yml`` file to "true". Then put into the ``header-custom.html`` file, your custom code. +In the same way, you can customize the footer of the navigation menu, by setting to "true" the related option and put your code into the ``nav-footer-custom.html`` file. +Moreover it is now possible to select a reverse option that allows to put the navigation menu to the left side, by setting it to "true". + +### Colors +In the ``base.scss`` file are set the basic colors: +- $main-color: used for the menu, title, link and footer +- $background-color: used for background and links in the navigation menu +- $text-color: used for text and title in posts and pages + +To customize the colors, just set the values in HEX, RGB (or RGBa) or any other format accepted by CSS. + +### Navigation menu +Starting from the 1.1.0 version, the links inside the navigation menu, are autogenerated from pages having the layout set to ``page``. +You can set custom links, by putting in the ```` tag into the ``link.html`` file. + ### Branch Emerald has two branch: - ``master``: is for developing pourpose. From a3ae3621dfc5a6df68b4c1f3f5c6a59721f7ca3d Mon Sep 17 00:00:00 2001 From: KingFelix Date: Mon, 4 May 2015 21:24:31 +0200 Subject: [PATCH 02/13] Correct typo into the readme file --- readme.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index f2914eaf8d..969b7ba91c 100644 --- a/readme.md +++ b/readme.md @@ -11,12 +11,12 @@ After extracting the content from the folder into the selected directory, you ca Additionally it is possible to fork the repository and use Github Pages as hosting. By following this way it will be enough to change the ``baseurl`` value into the ``_config.yml`` file, with the directory name of your project (for example /blog) or simply with a "/" (slash) if you want install Emerald in the root. ### Options -Starting from the 1.1.0 version, you can customize Emerald thanks to a few options. Now it is possible to set a custom header by setting the related option in the ``_config.yml`` file to "true". Then put into the ``header-custom.html`` file, your custom code. +Starting from the 1.1.0 version, you can customize Emerald thanks to a few options. Now it is possible to set a custom header tag by setting the related option in the ``_config.yml`` file to "true". Then insert your custom code into the ``header-custom.html`` file. In the same way, you can customize the footer of the navigation menu, by setting to "true" the related option and put your code into the ``nav-footer-custom.html`` file. -Moreover it is now possible to select a reverse option that allows to put the navigation menu to the left side, by setting it to "true". +Moreover it is now possible to select a reverse option that allows to move the navigation menu to the left side, by setting it to "true". ### Colors -In the ``base.scss`` file are set the basic colors: +The basic colors are set into the ``base.scss`` file: - $main-color: used for the menu, title, link and footer - $background-color: used for background and links in the navigation menu - $text-color: used for text and title in posts and pages @@ -24,7 +24,7 @@ In the ``base.scss`` file are set the basic colors: To customize the colors, just set the values in HEX, RGB (or RGBa) or any other format accepted by CSS. ### Navigation menu -Starting from the 1.1.0 version, the links inside the navigation menu, are autogenerated from pages having the layout set to ``page``. +Starting from the 1.1.0 version, the links inside the navigation menu are autogenerated from pages having the layout set to ``page``. You can set custom links, by putting in the ```` tag into the ``link.html`` file. ### Branch From 06d8b12fa969689754acb95505962819be8eb223 Mon Sep 17 00:00:00 2001 From: KingFelix Date: Tue, 5 May 2015 22:16:50 +0200 Subject: [PATCH 03/13] Fix post url into index.html file & update version --- _config.yml | 2 +- index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 9654dd0949..dd6ac88571 100644 --- a/_config.yml +++ b/_config.yml @@ -26,7 +26,7 @@ defaults: layout: "post" # Custom variables -version: "1.0.1" +version: "1.1.0" # Options custom_header: false diff --git a/index.html b/index.html index 3c513bae60..c589aa4bf9 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ {% for post in paginator.posts %}
  • -

    {{ post.title }}

    +

    {{ post.title }}

    {{ post.content | strip_html | truncatewords:50 }}

    • From c7876f35e2b4cc3843a3c958e70a8ee7d85612dc Mon Sep 17 00:00:00 2001 From: KingFelix Date: Tue, 5 May 2015 22:39:13 +0200 Subject: [PATCH 04/13] Fix pages url in menu.html file --- _includes/menu.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/menu.html b/_includes/menu.html index 24b189059d..55dd16a40f 100644 --- a/_includes/menu.html +++ b/_includes/menu.html @@ -5,7 +5,7 @@ {% for page in site.pages %} {% if page.layout == "page" %} - {{ page.title }} + {{ page.title }} {% endif %} {% endfor %} From fd03e0bb18eaa530d9d6480df8b7d43503d7a210 Mon Sep 17 00:00:00 2001 From: Alessandro Fusco Date: Sun, 16 Aug 2015 15:14:10 +0200 Subject: [PATCH 05/13] Changes the nav-menu button's position to fixed, so that it will be visible even if the user scrolls down the page. It also prevents it from jumping to the top of the page when clicked. --- _layouts/default.html | 2 +- _sass/mixin.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_layouts/default.html b/_layouts/default.html index bba5cb792b..9d3ba7a6dc 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -10,7 +10,7 @@ {% include menu.html %} - + diff --git a/_sass/mixin.scss b/_sass/mixin.scss index d05b07b4af..cd13e896a8 100644 --- a/_sass/mixin.scss +++ b/_sass/mixin.scss @@ -4,7 +4,7 @@ @mixin icon-position($position) { display: block; - position: absolute; + position: fixed; top: 35px; #{$position}: 25px; z-index: 10; From 77f650b7921fad56cd8b6594c7adf8d321449434 Mon Sep 17 00:00:00 2001 From: Andre Bessi Date: Mon, 28 Dec 2015 17:27:34 +0100 Subject: [PATCH 06/13] Create 404.md --- 404.md | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 404.md diff --git a/404.md b/404.md new file mode 100644 index 0000000000..02b0b1d46e --- /dev/null +++ b/404.md @@ -0,0 +1,7 @@ +--- +layout: default +title: 404 - Page not found +--- +404 - Page not found +==================== +Sorry, we couldn’t find the requested URL. You can try again by going [back to the homepage]({{ site.baseurl }}/). From 8f5eb1ecb0454722b16ab0fea02f0ed1e90a0743 Mon Sep 17 00:00:00 2001 From: Andre Bessi Date: Mon, 28 Dec 2015 17:34:32 +0100 Subject: [PATCH 07/13] Update 404.md --- 404.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/404.md b/404.md index 02b0b1d46e..0137fd7234 100644 --- a/404.md +++ b/404.md @@ -4,4 +4,4 @@ title: 404 - Page not found --- 404 - Page not found ==================== -Sorry, we couldn’t find the requested URL. You can try again by going [back to the homepage]({{ site.baseurl }}/). +Sorry, we couldn’t find the requested URL. You can try again by going [back to the homepage]({{ site.baseurl }}). From 4dcefc9f3f7bb730fe0bc03809e57e4280f2a3a6 Mon Sep 17 00:00:00 2001 From: KingFelix Date: Wed, 16 Mar 2016 23:58:26 +0100 Subject: [PATCH 08/13] Fix menu tablet portrait --- _sass/layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/_sass/layout.scss b/_sass/layout.scss index 105776824c..3843864718 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -105,6 +105,7 @@ .fixed { position: fixed; + width: 100%; @media (min-width: 940px) { position: static; } From 2674dc19cd06670c0576c7fab03ae6e1445a28b2 Mon Sep 17 00:00:00 2001 From: KingFelix Date: Fri, 16 Sep 2016 19:17:38 +0200 Subject: [PATCH 09/13] fix path --- _config.yml | 6 +++++- _includes/head.html | 2 +- _includes/header.html | 2 +- _includes/script.html | 2 +- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/_config.yml b/_config.yml index dd6ac88571..e6f5d62606 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,7 @@ author: url: "http://www.jacoporabolini.com" # Build settings -baseurl: /emerald/ # Change this to your relative path (ex: /blog/), or leave just a / +baseurl: /emerald # Change this to your relative path (ex: /blog/), or leave just a / markdown: kramdown source: . destination: ./_site @@ -25,6 +25,10 @@ defaults: values: layout: "post" +# Plugins +gems: + - jekyll-paginate + # Custom variables version: "1.1.0" diff --git a/_includes/head.html b/_includes/head.html index 22311155b1..8bc9136530 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,7 +7,7 @@ {%if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + diff --git a/_includes/header.html b/_includes/header.html index 0795cbbb5a..ee317db1a2 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,6 +1,6 @@ diff --git a/_includes/script.html b/_includes/script.html index d67aeef3ab..c33ba6d6a8 100644 --- a/_includes/script.html +++ b/_includes/script.html @@ -1 +1 @@ - + From 00888f0f382470a9db47216f24419218f88b46a9 Mon Sep 17 00:00:00 2001 From: Dezon <0x79d.m@gmail.com> Date: Wed, 19 Oct 2016 22:09:55 +0800 Subject: [PATCH 10/13] Fix url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When the site.baseurl is / , the url is http://css/main.css。also with img & js --- _includes/head.html | 2 +- _includes/header.html | 2 +- _includes/script.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_includes/head.html b/_includes/head.html index 8bc9136530..90d1f14e42 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -7,7 +7,7 @@ {%if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %} - + diff --git a/_includes/header.html b/_includes/header.html index ee317db1a2..6fc93e607f 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -1,6 +1,6 @@ diff --git a/_includes/script.html b/_includes/script.html index c33ba6d6a8..b10f08b045 100644 --- a/_includes/script.html +++ b/_includes/script.html @@ -1 +1 @@ - + From e5460d1275b9951dbe302500fe8da6aa820e2c75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noah=20=C3=93=20Donnaile?= Date: Sat, 17 Dec 2016 16:07:10 +0000 Subject: [PATCH 11/13] Update head.html to have https font link --- _includes/head.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/head.html b/_includes/head.html index 90d1f14e42..fbf0082790 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -8,7 +8,7 @@ - + From 8ffad8e6b40ef925940b52411bf559cf0d46b24b Mon Sep 17 00:00:00 2001 From: Mihajlo Date: Mon, 18 Mar 2019 10:07:34 +0100 Subject: [PATCH 12/13] Footer sticks to the bottom --- _includes/footer.html | 2 +- _posts/2019-03-18-small-text.md | 4 ++++ _sass/layout.scss | 21 +++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 _posts/2019-03-18-small-text.md diff --git a/_includes/footer.html b/_includes/footer.html index 64b2017df3..d48c1c4755 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1 +1 @@ -
    @2015 - Emerald
    \ No newline at end of file +
    @2015 - Emerald
    \ No newline at end of file diff --git a/_posts/2019-03-18-small-text.md b/_posts/2019-03-18-small-text.md new file mode 100644 index 0000000000..ff7f30d2e1 --- /dev/null +++ b/_posts/2019-03-18-small-text.md @@ -0,0 +1,4 @@ +--- +title: Small text +--- +This is an example of a blog post with small amount of text. \ No newline at end of file diff --git a/_sass/layout.scss b/_sass/layout.scss index 3843864718..3f02a2445a 100644 --- a/_sass/layout.scss +++ b/_sass/layout.scss @@ -1,5 +1,10 @@ /* -- General Layout -- */ +/* Required for footer to stick to the bottom */ +html, body { + height: 100%; +} + /* Navigation */ #nav, #nav-left { @@ -253,3 +258,19 @@ footer { text-align: center; padding: 0.6667em 0; } + +#wrap { + min-height:100%; + position:relative; + padding-bottom: 105px; +} + +.footer { + padding: 25px 0; + background-color: $main-color; + color: $background-color; + text-align: center; + position: absolute; + width: 100%; + bottom: 0; +} From 04685b539a80cb4c8cd0713798f54ab35b5fecdd Mon Sep 17 00:00:00 2001 From: Jacopo Rabolini Date: Wed, 23 Oct 2019 09:27:27 +0200 Subject: [PATCH 13/13] update linked site --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 969b7ba91c..462d93185c 100644 --- a/readme.md +++ b/readme.md @@ -46,7 +46,7 @@ Last but not least: the [Jekyll documentation](http://jekyllrb.com) is the best ### Jacopo Rabolini - Web site: [www.jacoporabolini.com](http://www.jacoporabolini.com) -- Google+: [+JacopoRabolini](https://plus.google.com/u/0/+JacopoRabolini/posts) +- Linkedin: [linkedin.com/in/jacopo-rabolini/](https://www.linkedin.com/in/jacopo-rabolini/) ## License Emerald is released under [MIT License](license.md).