Fix smaller design issues caused by minimization

DigitaleGesellschaft · Nov 17, 2020 · c5aaedc · c5aaedc
1 parent 65e677b
commit c5aaedc
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 17 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 {% if room.hide or site.conference.location.hide %}
-  <span class="badge badge-light font-weight-normal text-left"><i class="far fa-square"></i> {{ room.name }}</span><!--
+  <span class="badge badge-light font-weight-normal text-left"><i class="far fa-square"></i>&nbsp;{{ room.name }}</span><!--
 {% else %}
-  <a href="{{ room.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal"><i class="far fa-square"></i> {{ room.name }}</a><!--
+  <a href="{{ room.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal"><i class="far fa-square"></i>&nbsp;{{ room.name }}</a><!--
 {% endif %}-->
diff --git a/_includes/partials/show_talk_duration.html b/_includes/partials/show_talk_duration.html
@@ -1,3 +1,3 @@
 <span class="badge badge-light font-weight-normal text-left">
-  <i class="fas fa-stopwatch"></i> {{ talk_duration_min }}min
+  <i class="fas fa-stopwatch"></i>&nbsp;{{ talk_duration_min }}min
 </span>
diff --git a/_includes/partials/show_talk_time.html b/_includes/partials/show_talk_time.html
@@ -1,3 +1,3 @@
 <a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="badge badge-light font-weight-normal text-left">
-  <i class="far fa-clock"></i> {{ talk_start_hour }}:{% if talk_start_min == 0 %}0{%endif %}{{ talk_start_min }}
+  <i class="far fa-clock"></i>&nbsp;{{ talk_start_hour }}:{% if talk_start_min == 0 %}0{%endif %}{{ talk_start_min }}
 </a>
diff --git a/_layouts/speaker.html b/_layouts/speaker.html
@@ -23,8 +23,7 @@ <h1 class="font-weight-light mb-3">
         {% if link_icon %}
           <li class="mb-1 ml-2">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1"></i>
-              {{ link.name }}
+              <i class="fas fa-{{ link_icon }} pr-1"></i>&nbsp;{{ link.name }}
             </a>
           </li>
         {% endif %}
@@ -100,8 +99,7 @@ <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].speaker.talks | de
 
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
-      <i class="fas fa-users"></i>
-      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
+      <i class="fas fa-users"></i>&nbsp;{{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
   </p>
 

diff --git a/_layouts/talk.html b/_layouts/talk.html
@@ -80,8 +80,7 @@ <h1 class="font-weight-light">{{ talk.name }}</h1>
         {% if link_icon %}
           <li class="mb-1 ml-2">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>
-              {{ link.name }}
+              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>&nbsp;{{ link.name }}
             </a>
           </li>
         {% endif %}
@@ -110,13 +109,11 @@ <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information |
 
   <p class="d-print-none mt-5">
     <a href="{{ page.collection | prepend: '/' | prepend: site.baseurl }}" class="btn btn-light">
-      <i class="fas fa-bullhorn"></i>
-      {{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
+      <i class="fas fa-bullhorn"></i>&nbsp;{{ site.data.lang[site.conference.lang].overview | default: "Overview" }}
     </a>
 
     <a href="{{ site.conference.program.url | prepend: site.baseurl }}" class="btn btn-light">
-      <i class="far fa-calendar-alt"></i>
-      {{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
+      <i class="far fa-calendar-alt"></i>&nbsp;{{ site.data.lang[site.conference.lang].program.title | default: "Program" }}
     </a>
   </p>
 

diff --git 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"]