Skip to content

Commit

Permalink
Redesign site content (#19)
Browse files Browse the repository at this point in the history
* Add .gitignore and renamed search

* Refactor page layout and format

* Remove deprecated files

* Home format
  • Loading branch information
rubenrubiob authored Nov 26, 2022
1 parent 37230f6 commit 056b9fb
Show file tree
Hide file tree
Showing 44 changed files with 67 additions and 4,427 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/.idea/
/.jekyll-metadata
/_pages/
/_site/
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
source 'https://rubygems.org'
gem 'github-pages', group: :jekyll_plugins
gem 'github-pages', group: :jekyll_plugins
gem "webrick", "~> 1.7"
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -248,13 +248,15 @@ GEM
unf_ext
unf_ext (0.0.7.7)
unicode-display_width (1.7.0)
webrick (1.7.0)
zeitwerk (2.6.1)

PLATFORMS
ruby

DEPENDENCIES
github-pages
webrick (~> 1.7)

BUNDLED WITH
2.1.4
10 changes: 5 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
theme: jekyll-theme-tactile
lang: es
lang: ca
languages: ["es", "ca"]
pull_request_url_prefix: https://github.com/rubenrubiob/gestor-libros/pull/

titles_from_headings:
enabled: true
Expand All @@ -14,13 +13,13 @@ titles_from_headings:
#

# Name of your site (displayed in the header)
name: GLH
name: Rubén Rubio

# Name of the author
author: Rubén Rubio

# Short bio or description (displayed in the header)
description: Gestor Libros - hexagonal PHP
description: Rubén Rubio

# URL of your avatar or profile pic (you could use your GitHub profile pic)
#avatar: /images/reverie.png
Expand Down Expand Up @@ -81,7 +80,7 @@ kramdown:

# Set the Sass partials directory, as we're using @imports
sass:
style: :expanded # You might prefer to minify using :compressed
style: :compressed # You might prefer to minify using :compressed

# Use the following plug-ins
plugins:
Expand All @@ -96,4 +95,5 @@ exclude:
- LICENSE
- README.md
- CNAME
- .idea/

24 changes: 0 additions & 24 deletions _data/translations.yml
Original file line number Diff line number Diff line change
@@ -1,24 +0,0 @@
relatedPosts:
ca: "Articles relacionats"
es: "Artículos relacionados"
differentLanguage:
ca: "Llegir aquest contingut en castellà"
es: "Leer este contenido en catalán"
menu.home:
ca: "Inici"
es: "Inicio"
menu.content:
ca: "Continguts"
es: "Contenidos"
menu.search:
ca: "Cercar"
es: "Buscar"
search.placeholder:
ca: "Cercar als continguts..."
es: "Buscar en los contenidos..."
pull_request.link:
ca: "Consultar el codi"
es: "Consultar el código"
site.description:
ca: "Gestor LLibres - hexagonal PHP"
es: "Gestor Libros - hexagonal PHP"
15 changes: 5 additions & 10 deletions _includes/menu.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
{% assign content_page=site.pages | where:"lang-ref", "content-list" %}
{% assign content_page=content_page | where: "lang", page.lang | first %}

{% assign search_page=site.pages | where:"lang-ref", "search" %}
{% assign search_page=search_page | where: "lang", page.lang | first %}


<a href="{{ site.baseurl }}/{{ page.lang }}/">{{ site.data.translations['menu.home'][page.lang] }}</a>
<a href="{{ site.baseurl }}{{ content_page.url }}">{{ site.data.translations['menu.content'][page.lang] }}</a>
<a href="{{ site.baseurl }}{{ search_page.url }}">{{ site.data.translations['menu.search'][page.lang] }}</a>
<a href="{{ site.baseurl }}/">Inici</a>
<a href="{{ site.baseurl }}/filosofia">Filosofia</a>
<a href="{{ site.baseurl }}/dev">Dev</a>
<a href="{{ site.baseurl }}/divan-del-tamarit">Diván del Tamarit</a>
<a href="{{ site.baseurl }}/cercar">Cercar</a>
8 changes: 7 additions & 1 deletion _includes/menu.html.liquid
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
---

---

{% assign content_page=site.pages | where:"lang-ref", "content-list" %}
{% assign content_page=content_page | where: "lang", page.lang | first %}

Expand All @@ -7,4 +11,6 @@

<a href="{{ site.baseurl }}/{{ page.lang }}/">{{ site.data.translations['menu.home'][page.lang] }}</a>
<a href="{{ site.baseurl }}{{ content_page.url }}">{{ site.data.translations['menu.content'][page.lang] }}</a>
<a href="{{ site.baseurl }}{{ search_page.url }}">{{ site.data.translations['menu.search'][page.lang] }}</a>
<a href="{{ site.baseurl }}{{ search_page.url }}">{{ site.data.translations['menu.search'][page.lang] }}</a>
<a href="{{ site.baseurl }}/divan-del-tamarit">Divá del Tamarit</a>

4 changes: 2 additions & 2 deletions _includes/svg-icons.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
{% if site.footer-links.email %}<a href="mailto:{{ site.footer-links.email }}"><i class="svg-icon email"></i></a>{% endif %}
{% if site.footer-links.facebook %}<a href="https://www.facebook.com/{{ site.footer-links.facebook }}"><i class="svg-icon facebook"></i></a>{% endif %}
{% if site.footer-links.flickr %}<a href="https://www.flickr.com/{{ site.footer-links.flickr }}"><i class="svg-icon flickr"></i></a>{% endif %}
{% if site.footer-links.github %}<a href="https://github.com/{{ site.footer-links.github }}"><i class="svg-icon github"></i></a>{% endif %}
{% if site.footer-links.instagram %}<a href="https://instagram.com/{{ site.footer-links.instagram }}"><i class="svg-icon instagram"></i></a>{% endif %}
{% if site.footer-links.linkedin %}<a href="https://www.linkedin.com/in/{{ site.footer-links.linkedin }}"><i class="svg-icon linkedin"></i></a>{% endif %}
{% if site.footer-links.pinterest %}<a href="https://www.pinterest.com/{{ site.footer-links.pinterest }}"><i class="svg-icon pinterest"></i></a>{% endif %}
{% if site.footer-links.rss %}<a href="{{ site.baseurl }}/feed.xml"><i class="svg-icon rss"></i></a>{% endif %}
{% if site.footer-links.github %}<a href="https://github.com/{{ site.footer-links.github }}"><i class="svg-icon github"></i></a>{% endif %}
{% if site.footer-links.twitter %}<a href="https://www.twitter.com/{{ site.footer-links.twitter }}"><i class="svg-icon twitter"></i></a>{% endif %}
{% if site.footer-links.rss %}<a href="{{ site.baseurl }}/feed.xml"><i class="svg-icon rss"></i></a>{% endif %}
{% if site.footer-links.stackoverflow %}<a href="http://stackoverflow.com/{{ site.footer-links.stackoverflow }}"><i class="svg-icon stackoverflow"></i></a>{% endif %}
{% if site.footer-links.youtube %}<a href="https://youtube.com/{{ site.footer-links.youtube }}"><i class="svg-icon youtube"></i></a>{% endif %}
{% if site.footer-links.googleplus %}<a href="https://plus.google.com/{{ site.footer-links.googleplus }}"><i class="svg-icon googleplus"></i></a>{% endif %}
Expand Down
4 changes: 1 addition & 3 deletions _layouts/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,9 @@
<div class="wrapper-masthead">
<div class="container">
<header class="masthead clearfix">
<a href="{{ site.baseurl }}/" class="site-avatar"><img src="{{ site.baseurl }}{{ site.avatar }}" alt="{{ site.title }}" /></a>

<div class="site-info">
<h1 class="site-name"><a href="{{ site.baseurl }}/">{{ site.name }}</a></h1>
<p class="site-description">{{ site.data.translations['site.description'][page.lang] | default: site.description }}</p>
<div class="site-description">Sènior PHP Backend i graduat en filosofia</div>
</div>

<nav>
Expand Down
4 changes: 2 additions & 2 deletions _layouts/search.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
SimpleJekyllSearch({
searchInput: document.getElementById('search-input'),
resultsContainer: document.getElementById('results-container'),
searchResultTemplate: '<div style="text-align: left !important;"><a href="{url}"><h1 style="text-align:left !important;">{title}</h1></a><div style="text-align:left !important;" class="post-tags">{tags}</div><br /><div style="text-align:left !important;">{summary}</div></div>',
json: '{{ site.baseurl }}/search-{{ page.lang }}.json',
searchResultTemplate: '<div style="text-align: left !important;"><a href="{url}"><h1 style="text-align:left !important;">{title}</h1></a><br /><div style="text-align:left !important;">{summary}</div></div>',
json: '{{ site.baseurl }}/search.json',
templateMiddleware: function (prop, value, template) {
if (prop !== 'tags') {
return;
Expand Down
4 changes: 2 additions & 2 deletions assets/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ p > img {
.site-description {
margin: -5px 0 0 0;
color: $gray;
font-size: 16px;
font-size: 12px;

@include mobile {
margin: 3px 0;
Expand All @@ -369,7 +369,7 @@ p > img {

nav {
float: right;
margin-top: 23px; // @TODO: Vertically middle align
margin-top: 20px; // @TODO: Vertically middle align
font-family: $iaWriter;
font-size: 18px;

Expand Down
8 changes: 0 additions & 8 deletions ca/cercar.md

This file was deleted.

Loading

0 comments on commit 056b9fb

Please sign in to comment.