From c5aaedc255a7c71e8a0c0edf69d670c3865f2cde Mon Sep 17 00:00:00 2001 From: Lorenz Schmid Date: Tue, 17 Nov 2020 19:15:44 +0100 Subject: [PATCH] Fix smaller design issues caused by minimization --- Gemfile.lock | 2 +- _data/lang.yml | 2 +- _includes/js/conference-live.js | 3 +++ _includes/partials/show_room.html | 4 ++-- _includes/partials/show_talk_duration.html | 2 +- _includes/partials/show_talk_time.html | 2 +- _layouts/speaker.html | 6 ++---- _layouts/talk.html | 9 +++------ jekyll-theme-conference.gemspec | 2 +- 9 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 137e7631..f4f7c45b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jekyll-theme-conference (2.5.3) + jekyll-theme-conference (2.5.4) jekyll (~> 4.0) GEM diff --git a/_data/lang.yml b/_data/lang.yml index 27f132b9..27859191 100644 --- a/_data/lang.yml +++ b/_data/lang.yml @@ -69,7 +69,7 @@ de: now: jetzt location: title: Örtlichkeit - directions: Anfahrt + directions: Anreise talks: Vorträge in diesem Raum no_talks: keine Vorträge geplant focus_conf: Karte auf den Konferenz-Ort zentrieren diff --git a/_includes/js/conference-live.js b/_includes/js/conference-live.js index ba0410af..cb2fa844 100644 --- a/_includes/js/conference-live.js +++ b/_includes/js/conference-live.js @@ -366,6 +366,9 @@ document.getElementById('stream-info-time').dataset.time = talkNow.start; updateLive(); + streamModal.find('#stream-info-color').removeClass(function (index, className) { + return (className.match(/(^|\s)border-soft-\S+/g) || []).join(' '); + }); streamModal.find('#stream-info-color').addClass('border-soft-' + talkNow.color); streamModal.find('#stream-info-talk').text(talkNow.name).attr('href', talkNow.href); diff --git a/_includes/partials/show_room.html b/_includes/partials/show_room.html index 4ac2a232..18822b4c 100644 --- a/_includes/partials/show_room.html +++ b/_includes/partials/show_room.html @@ -1,5 +1,5 @@ {% if room.hide or site.conference.location.hide %} - {{ room.name }} diff --git a/_includes/partials/show_talk_duration.html b/_includes/partials/show_talk_duration.html index fcac7a7a..5613ab41 100644 --- a/_includes/partials/show_talk_duration.html +++ b/_includes/partials/show_talk_duration.html @@ -1,3 +1,3 @@ - {{ talk_duration_min }}min +  {{ talk_duration_min }}min diff --git a/_includes/partials/show_talk_time.html b/_includes/partials/show_talk_time.html index 272e221c..2ae315c5 100644 --- a/_includes/partials/show_talk_time.html +++ b/_includes/partials/show_talk_time.html @@ -1,3 +1,3 @@ - {{ talk_start_hour }}:{% if talk_start_min == 0 %}0{%endif %}{{ talk_start_min }} +  {{ talk_start_hour }}:{% if talk_start_min == 0 %}0{%endif %}{{ talk_start_min }} diff --git a/_layouts/speaker.html b/_layouts/speaker.html index 63a5a32e..489e933a 100644 --- a/_layouts/speaker.html +++ b/_layouts/speaker.html @@ -23,8 +23,7 @@

{% if link_icon %}
  • {{ link_tag }} - - {{ link.name }} +  {{ link.name }}
    • {% endif %} @@ -100,8 +99,7 @@

    {{ site.data.lang[site.conference.lang].speaker.talks | de

    - - {{ site.data.lang[site.conference.lang].overview | default: "Overview" }} +  {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}

    diff --git a/_layouts/talk.html b/_layouts/talk.html index 5b617450..26fdb56c 100644 --- a/_layouts/talk.html +++ b/_layouts/talk.html @@ -80,8 +80,7 @@

    {{ talk.name }}

    {% if link_icon %}
  • {{ link_tag }} - - {{ link.name }} +  {{ link.name }}
    • {% endif %} @@ -110,13 +109,11 @@
    {{ site.data.lang[site.conference.lang].more_information |

    - - {{ site.data.lang[site.conference.lang].overview | default: "Overview" }} +  {{ site.data.lang[site.conference.lang].overview | default: "Overview" }} - - {{ site.data.lang[site.conference.lang].program.title | default: "Program" }} +  {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}

    diff --git a/jekyll-theme-conference.gemspec b/jekyll-theme-conference.gemspec index b22d10d5..a29f799a 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 = "2.5.3" + spec.version = "2.5.4" spec.authors = ["Lorenz Schmid"] spec.email = ["lorenzschmid@users.noreply.github.com"]