Smaller design improvements using category color for all talk elements

DigitaleGesellschaft · Nov 3, 2020 · d0e0db7 · d0e0db7
1 parent 08f1a18
commit d0e0db7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 10 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-theme-conference (2.3.0)
+    jekyll-theme-conference (2.3.1)
       jekyll (~> 4.0)
 
 GEM

diff --git a/_includes/partials/get_link.html b/_includes/partials/get_link.html
@@ -29,7 +29,15 @@
 
   {% if talk %}
     {% capture modal_header %}
-      <h3 class="font-weight-light">{{ talk.name }}</h3>
+      <h3 class="font-weight-light">
+        {% if talk.hide %}
+          {{ talk.name }}
+        {% else %}
+          <a class="text-reset" href="{{ talk.url | prepend: site.baseurl }}">
+            {{ talk.name }}
+          </a>
+        {% endif %}
+      </h3>
       <p class="mb-0 font-weight-light">
         {% include partials/list_speakers.html %}
       </p>
@@ -38,7 +46,13 @@ <h3 class="font-weight-light">{{ talk.name }}</h3>
   {% elsif speaker %}
     {% capture modal_header %}
       <h3 class="mb-0 font-weight-light">
-        {{ speaker.first_name }} {{ speaker.last_name }}
+        {% if speaker.hide %}
+          {{ speaker.first_name }} {{ speaker.last_name }}
+        {% else %}
+          <a class="text-reset" href="{{ speaker.url | prepend: site.baseurl }}">
+            {{ speaker.first_name }} {{ speaker.last_name }}
+          </a>
+        {% endif %}
       </h3>
     {% endcapture %}
     {% assign modal_desc = link.name %}

diff --git a/_layouts/program.html b/_layouts/program.html
@@ -57,7 +57,7 @@ <h1 class="display-5 mb-4">
   {{ content }}
 
   <div class="sticky-top syncscroll overflow-hidden" name="sync-table">
-    <table class="table">
+    <table class="table mb-0">
       <thead>
         <tr>
           <th scope="col" class="text-center">#</th>

diff --git a/_layouts/talk-overview.html b/_layouts/talk-overview.html
@@ -33,9 +33,9 @@ <h3 class="mt-4 mb-3">
 
                 {% include partials/get_link_types.html %}
                 {% if has_icon_links and site.conference.talks.hide_icons != true %}
-                  <span class="{% if has_sub_categories %}ml-1{% endif %}">
+                  <span class="ml-1">
                     {% for link in talk.links %}
-                      {% assign link_styleclass = "" %}
+                      {% assign link_styleclass = "text-secondary" %}
                       {% include partials/get_link.html %}
                       {% if link_icon %}
                         {{ link_tag -}}

diff --git a/_layouts/talk.html b/_layouts/talk.html
@@ -61,13 +61,13 @@ <h1 class="font-weight-light">{{ talk.name }}</h1>
   {% if has_icon_links %}
     <ul class="list-unstyled">
       {% for link in talk.links %}
-        {% assign link_styleclass = "" %}
+        {% assign link_styleclass = "text-reset" %}
         {% include partials/get_link.html %}
 
         {% if link_icon %}
           <li class="mb-1 ml-2">
             {{ link_tag }}
-              <i class="fas fa-{{ link_icon }} pr-1"></i>
+              <i class="fas fa-{{ link_icon }} pr-1 text-{{ main_cat_color }}"></i>
               {{ link.name }}
             </a>
           </li>
@@ -85,7 +85,7 @@ <h5 class="mt-4 mb-1">{{ site.data.lang[site.conference.lang].more_information |
         {% include partials/get_link.html %}
 
         {% unless link_icon %}
-          <li class="mb-1 ml-2 pl-2 border-soft-primary">
+          <li class="mb-1 ml-2 pl-2 border-soft-{{ main_cat_color }}">
             {{ link_tag }}
               {{ link.name }}
             </a>

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.3.0"
+  spec.version       = "2.3.1"
   spec.authors       = ["Lorenz Schmid"]
   spec.email         = ["lorenzschmid@users.noreply.github.com"]