diff --git a/Gemfile.lock b/Gemfile.lock index 8ceedbd4..d4eb4262 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jekyll-theme-conference (3.0.1) + jekyll-theme-conference (3.0.2) jekyll (~> 4.0) GEM diff --git a/_layouts/program.html b/_layouts/program.html index ddc68acd..2bbacd82 100644 --- a/_layouts/program.html +++ b/_layouts/program.html @@ -30,11 +30,11 @@

- +
- - + + {%- assign nbr_rooms = d.rooms | size -%} {%- for r in d.rooms -%} {%- assign room = site.rooms | where: 'name', r.name | first %} @@ -48,7 +48,7 @@

{%- unless forloop.last %} -

+ {%- endunless -%} {%- endfor %} @@ -57,7 +57,7 @@

-

##
+
{%- include partials/get_day_time.html -%} @@ -85,17 +85,17 @@

{%- if current_min == 0 -%} -

{%- elsif site.conference.program.show_alltimes -%} - {%- else -%} - + {%- endif %} - + {%- for r in d.rooms -%} {%- assign room = site.rooms | where: 'name', r.name | first -%} @@ -135,7 +135,7 @@

+

+ {%- endif -%} {%- endfor %} diff --git a/_sass/conference.scss b/_sass/conference.scss index c83fe687..1acb5613 100644 --- a/_sass/conference.scss +++ b/_sass/conference.scss @@ -130,22 +130,24 @@ ul.btn-group { // First row defines width for all columns table-layout: fixed; - // Table width - min-width: 100%; + // Columns define table width + width: auto; // Column widths - tr { + th, td { + // Width of columns with content (default) + width: 220px; + min-width: 220px; + // Spacing between columns - > :nth-child(even) { + &.col-space { width: 10px; - } - // Width of columns with content - > :nth-child(odd) { - width: 180px; + min-width: 10px; } // Width of first column containing timestamps - > :nth-child(1) { + &.col-title { width: 4.5em; + min-width: 4.5em; } } } diff --git a/jekyll-theme-conference.gemspec b/jekyll-theme-conference.gemspec index 69537a6c..b28a8e63 100644 --- a/jekyll-theme-conference.gemspec +++ b/jekyll-theme-conference.gemspec @@ -2,7 +2,7 @@ Gem::Specification.new do |spec| spec.name = "jekyll-theme-conference" - spec.version = "3.0.1" + spec.version = "3.0.2" spec.authors = ["Lorenz Schmid"] spec.email = ["lorenzschmid@users.noreply.github.com"]
+ {{- current_time -}} + :{{ current_min }} {%- assign live_button_styleclass = "mb-2" %} {%- include partials/show_live_button.html %} @@ -161,7 +161,7 @@