Fix program column widths

DigitaleGesellschaft · Dec 15, 2020 · afde362 · afde362
1 parent c1fd898
commit afde362
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 13 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jekyll-theme-conference (3.0.2)
+    jekyll-theme-conference (3.0.3)
       jekyll (~> 4.0)
 
 GEM

diff --git a/_layouts/home.html b/_layouts/home.html
@@ -23,11 +23,12 @@ <h1 class="display-3">
 
     {% if site.conference.main.links %}
       <div class="lead d-print-none">
+      {% assign btn_default = 'btn btn-outline-primary btn-lg mt-2 ml-1' %}
       {% for link in site.conference.main.links %}
 
         {% if link.menu %}
           <div class="dropdown d-inline">
-            <a class="btn btn-outline-primary btn-lg mt-2 dropdown-toggle" href="#" role="button" id="main-dropdown{{ forloop.index0 }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+            <a class="{{ btn_default }} dropdown-toggle" href="#" role="button" id="main-dropdown{{ forloop.index0 }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
               {{ link.name }}
             </a>
             <div class="dropdown-menu" aria-labelledby="main-dropdown{{ forloop.index0 }}">
@@ -52,16 +53,16 @@ <h1 class="display-3">
           {%- endif -%}
 
           {%- if link.name_inactive -%}
-            <span class="live-hide btn btn-outline-primary btn-lg mt-2 disabled" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
+            <span class="live-hide {{ btn_default }} disabled" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
               {{ link.name_inactive }}
             </span>
           {%- endif -%}
 
           <span class="live-show d-none" data-start="{{ live_starts }}" data-end="{{ live_ends }}">
             {% if site.conference.live.streaming %}
-              <a class="btn btn-outline-primary btn-lg mt-2" title="{{ link_name }}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
+              <a class="{{ btn_default }}" title="{{ link_name }}" data-toggle="modal" data-target="#stream-modal" data-room="" href="#">
             {% else %}
-              {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
+              {% assign link_styleclass = "{{ btn_default }}" %}
               {% include partials/get_link.html %}
               {{ link_tag }}
             {% endif %}
@@ -71,7 +72,7 @@ <h1 class="display-3">
           </span>
 
         {% else %}
-          {% assign link_styleclass = "btn btn-outline-primary btn-lg mt-2" %}
+          {% assign link_styleclass = btn_default %}
           {% include partials/get_link.html %}
           {{ link_tag }}
             {{ link.name }}

diff --git a/_sass/conference.scss b/_sass/conference.scss
@@ -135,19 +135,21 @@ ul.btn-group {
 
   // Column widths
   th, td {
+    // Total available container width is 1110px
+
     // Width of columns with content (default)
-    width: 220px;
-    min-width: 220px;
+    width: 245px;
+    min-width: 245px;
 
     // Spacing between columns
     &.col-space {
-      width: 10px;
-      min-width: 10px;
+      width: 15px;
+      min-width: 15px;
     }
     // Width of first column containing timestamps
     &.col-title {
-      width: 4.5em;
-      min-width: 4.5em;
+      width: 70px;
+      min-width: 70px;
     }
   }
 }

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