Skip to content

Commit

Permalink
Merge pull request #6 from MadridJUG/design_changes
Browse files Browse the repository at this point in the history
Design changes
  • Loading branch information
dgomezg authored Oct 28, 2024
2 parents 4bb5cfd + a53e658 commit 60080e0
Show file tree
Hide file tree
Showing 10 changed files with 208 additions and 48 deletions.
16 changes: 16 additions & 0 deletions _includes/date-as-page-a-day-calendar
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

{% assign days = "domingo,lunes,martes,miércoles,jueves,viernes,sábado" | split: "," %}
{% assign months = "enero,febrero,marzo,abril,mayo,junio,julio,agosto,septiembre,octubre,noviembre,diciembre" | split: "," %}

{% assign day_idx = date | date: "%w" | plus: 0 %}
{% assign day_name = days[day_idx] %}
{% assign month_idx = date | date: "%-m" | minus: 1 %}
{% assign month_name = months[month_idx] %}
<div class="page-a-day-calendar">
<time datetime="{{ date | date: "%Y-%m-%d" }}" class="icon">
<em>{{ day_name | capitalize }}</em> <!-- Day of the week (e.g., "Wednesday") -->
<strong>{{ month_name | capitalize }}</strong> <!-- Month name (e.g., "October") -->
<span>{{ date | date: "%-d" }}</span> <!-- Day of the month without leading zeros (e.g., "30") -->
<bold>{{ date | date: "%Y" }}</bold> <!-- Year (e.g., "2024") -->
</time>
</div>
73 changes: 30 additions & 43 deletions _includes/image-text-row
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,54 @@

{% for itr in itr-list %}

{% if itr.image-right %}

<div class="itr-container">
<div class="itr-text">
{% if itr.date %}
<h3>{{itr.date}}</h3>
{% endif %}
{% if itr.header %}
<h3>{{itr.header}}</h3>
{% endif %}
{% if itr.excerpt %}
<p>{{itr.excerpt}}</p>
{% endif %}
<div class="itr-container">

{% if itr.date %}
<div>
{% assign date = itr.date %}
{% include date-as-page-a-day-calendar date = itr.date %}

{% if itr.btn-url %}
<a href="{{itr.btn-url}}"
{% if itr.blank %}
target="_blank" rel="noopener noreferrer nofollow" {% endif %}
class="btn btn--{{itr.btn-class | default: "primary"}}">
{{itr.btn-label | default: "Learn more"}}
<a href="{{itr.btn-url}}"
{% if itr.blank %}
target="_blank" rel="noopener noreferrer nofollow" {% endif %}
class="btn btn--{{itr.btn-class | default: "primary"}}">
{{itr.btn-label | default: "Learn more"}}
</a>
{% endif %}
</div>
<div class="itr-image-container">
{% if itr.date %}
&nbsp;
{% endif %}
{% if itr.header %}
<br>
{% endif %}
<img src="{{itr.image-url}}" alt="{{itr.alt-text | default: ""}}" class="itr-image" {% if itr.image-width%}
style="width:{{itr.image-width}}"{% endif %}>
</div>
</div>
{% endif %}

{% else %}

<div class="itr-container">
{% if itr.image-right %}
<div class="itr-image-container">
<img src="{{itr.image-url}}" alt="{{itr.alt-text | default: ""}}" class="itr-image" {% if itr.image-width%}
style="width:{{itr.image-width}}"{% endif %}>
</div>
<div class="itr-text">
{% if itr.date %}
<h3>{{itr.date}}</h3>
{% endif %}

<div class="itr-text session-description">
{% if itr.header %}
<h3>{{itr.header}}</h3>
{% endif %}
{% if itr.excerpt %}
<p>{{itr.excerpt}}</p>
{% endif %}
{% if itr.btn-url %}
<a href="{{itr.btn-url}}"
{% if itr.blank %}
target="_blank" rel="noopener noreferrer nofollow" {% endif %}
class="btn btn--{{itr.btn-class | default: "primary"}}">
{{itr.btn-label | default: "Learn more"}}
</a>
</div>
{% else %}
<div class="itr-text session-description">
{% if itr.header %}
<h3>{{itr.header}}</h3>
{% endif %}
{% if itr.excerpt %}
<p>{{itr.excerpt}}</p>
{% endif %}
</div>
<div class="itr-image-container">
<img src="{{itr.image-url}}" alt="{{itr.alt-text | default: ""}}" class="itr-image" {% if itr.image-width%}
style="width:{{itr.image-width}}"{% endif %}>
</div>
</div>
{% endif %}
</div>

{% endif %}

Expand Down
8 changes: 4 additions & 4 deletions _pages/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@

comming-up-row-one:
- header: "Stack Allocation y Otros Monstruos"
date: 30 de Octubre de 2024
date: 2024-10-30
excerpt: "Casi todas las JVM actuales tienen alguna forma de stack allocation, particularmente una variante llamada scalar replacement.<br/>
Esta optimización se suele presentar como una forma de mejorar el rendimiento de nuestro programa, sobre todo al reducir la cantidad de basura generada. Pero aprovechada adecuadamente sirve para mucho más: para construir programas mejores sin afectar (casi) al rendimiento.<br/>
Tras una explicación de los fundamentos del stack allocation, pasaremos a ver algunos ejemplos reales. Y eso nos llevará a hablar de otras optimizaciones, de cómo se conjugan, de dónde están sus límites y de algún truco para saltar parte de esos límites."
Expand All @@ -54,7 +54,7 @@
image-width: "500px"
image-right: true
- header: "Building Full-Stack Web Apps with only Java"
date: 6 de Noviembre de 2024
date: 2024-11-06
excerpt: "Tired of juggling multiple languages for full-stack development? Imagine building a web application from start to finish using just Java.<br/>
Join us for a live coding session where we'll showcase the power of Spring Boot and Vaadin Flow. We'll demonstrate how to create a complete web application, including persistence, external services, and a visually appealing UI, all using Java.<br/>
Don't miss this opportunity to streamline your development process and explore the versatility of Java in full-stack development."
Expand All @@ -67,7 +67,7 @@
image-width: "500px"
image-right: false
- header: "Testcontainers made easy"
date: 12 de Noviembre de 2024
date: 2024-11-12
excerpt: "Testcontainers is an open-source framework for providing throwaway, lightweight instances of databases, message brokers, web browsers, or just about anything that can run in a Docker container. Integrated with test frameworks such as JUnit and Spock, it simplifies using the same system in production and during tests, so it's no longer needed to use something like H2 for tests.<br/>
Micronaut takes Testcontainers further, eliminating the need of actually using the Testcontainers API. It will provision the test resource automatically for both development mode and testing.<br/>
In this session, Micronaut committer Álvaro Sánchez-Mariscal will first explain what Testcontainers is and how it works without any framework ceremony. He will then demonstrate with examples how Micronaut Test Resources leverages Testcontainers, and how this integration dramatically improves the developer experience."
Expand All @@ -80,7 +80,7 @@
image-width: "500px"
image-right: true
- header: "De Java a Clojure sin morir en el intento"
date: 11 de Diciembre de 2024
date: 2024-12-11
excerpt: "Alonso Torres nos llevará en esta charla de la mano para adentrarnos en el mundo de Clojure sin miedos.</br><br/>Pronto completaremos el abstract de la charla."
#btn-url: "https://www.meetup.com/madridjug/events/304107149/"
#btn-class: "info"
Expand Down
1 change: 1 addition & 0 deletions _sass/oneflow.scss
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,4 @@

/* Fonts */
@import "oneflow/fonts";

1 change: 1 addition & 0 deletions _sass/oneflow/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ body:hover .visually-hidden button {
}

.itr-text {
margin-left: 1em;
flex: 1;
}

Expand Down
66 changes: 66 additions & 0 deletions _sass/oneflow/custom/_date.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
.page-a-day-calendar {
float:none;
margin: 2em;
}

time.icon
{
font-size: 1em; /* change icon size */
display: block;
position: relative;
width: 6em;
height: 6em;
background-color: #fff;
border-radius: 0.5em;
box-shadow: 0 1px 0 #bdbdbd, 0 2px 0 #fff, 0 3px 0 #bdbdbd, 0 4px 0 #fff, 0 5px 0 #bdbdbd, 0 0 0 1px #bdbdbd;
overflow: hidden;
}

time.icon *
{
display: block;
width: 100%;
font-size: 1em;
font-weight: bold;
font-style: normal;
text-align: center;
}

time.icon strong
{
position: absolute;
top: 0;
padding: 0.2em 0;
font-size: 0.9em;
color: #fff;
background-color: $primary-color;
border-bottom: 1px dashed $primary-color;
box-shadow: $box-shadow;
}

time.icon em
{
font-size: 0.7em;
position: absolute;
top: 2.7em;
color: $primary-color;
}

time.icon span
{
font-size: 2em;
letter-spacing: -0.05em;
padding-top: 1.1em;
color: #2f2f2f;
}

time.icon bold {
font-size: 0.8em;
position: absolute;
bottom: 0.2em;
color: $gray
}

.icon:hover {
background-color: $lighter-gray
}
22 changes: 22 additions & 0 deletions _sass/oneflow/custom/_sessions.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.session-description {
overflow: hidden;
position: relative;
}

.session-description h3 {
margin-top: 0em;
display: -webkit-box;
-webkit-line-clamp: 1; /* Show only the first few lines */
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;

}

.session-description p {
display: -webkit-box;
-webkit-line-clamp: 7; /* Show only the first few lines */
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}
64 changes: 64 additions & 0 deletions assets/css/_custom.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
.page-a-day-calendar {
float:left;
}

time.icon
{
font-size: 1em; /* change icon size */
display: block;
position: relative;
width: 7em;
height: 7em;
background-color: #fff;
border-radius: 0.6em;
box-shadow: 0 1px 0 #bdbdbd, 0 2px 0 #fff, 0 3px 0 #bdbdbd, 0 4px 0 #fff, 0 5px 0 #bdbdbd, 0 0 0 1px #bdbdbd;
overflow: hidden;
}

time.icon *
{
display: block;
width: 100%;
font-size: 1em;
font-weight: bold;
font-style: normal;
text-align: center;
}

time.icon strong
{
position: absolute;
top: 0;
padding: 0.4em 0;
color: #fff;
background-color: $info-color;
border-bottom: 1px dashed #f37302;
box-shadow: 0 2px 0 #fd9f1b;
}

time.icon em
{
font-size: 0.8em;
position: absolute;
top: 3.1em;
color: #fd9f1b;
}

time.icon span
{
font-size: 2em;
letter-spacing: -0.05em;
padding-top: 1.5em;
color: #2f2f2f;
}

time.icon bold {
font-size: 0.8em;
position: absolute;
bottom: 0.2em;
color: #bdbdbd
}

.icon:hover {
background-color: #f2f2f2;
}
2 changes: 1 addition & 1 deletion assets/css/custom-styles.css
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/* Custom stylesheet, add your own styles here */
/* Custom stylesheet, add your own styles here */
3 changes: 3 additions & 0 deletions assets/css/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ search: false

@import "oneflow/skins/{{ site.oneflow-skin | default: 'default' }}"; // skin
@import "oneflow"; // main partials
@import "oneflow/custom/date";
@import "oneflow/custom/sessions";

@import "all.min.css"; // fontawesome

//@import "custom";
@import "custom-styles.css" // custom css stylesheet

0 comments on commit 60080e0

Please sign in to comment.