better printing

_inventory/fraese.md

@@ -5,6 +5,7 @@ name: "CNC-Fräse"
 uid: 3fe2ca58-932a-440a-8c1f-b0f9f8db6ade
 safetybriefing: true
 wikilink: https://wiki.chaotikum.org/hackspace:infrastruktur:cncfraese
+manual: "bla"
 calcolor: "#96aa3d"
 imagetag: cncfraese
 contact:

_layouts/device.html

@@ -16,12 +16,18 @@ layout: default
           margin: auto;
           background-color: #FFA500;
           text-align:center;
-          padding-top: 30px;
+          padding-top: 20px;
           padding-left: 72px;
           padding-right: 72px;
           margin-left: -75px;">
           <h1 style="color: white">{{page.name}}</h1>
         </div>
+      </div>
+      {% if page.safetybriefing -%}
+        {% assign tuid = page.uid %}
+        {% include {{site.einweisung}} tuid=tuid%}
+      {% endif -%}
+      <div class="only-in-print">
         {% if page.safetybriefing -%}
         <div class="two-columns">
           {% for briefing in site.briefing -%}
@@ -42,10 +48,6 @@ layout: default
         </ul>
       </div>
       <div class="not-in-print">
-      {% if page.safetybriefing -%}
-        {% assign tuid = page.uid %}
-        {% include {{site.einweisung}} tuid=tuid%}
-      {% endif -%}
       {% endif -%}
       {% if page.manual -%}
         <img src="{{ site.url }}/assets/iso7010/M002.svg" alt="{{c}}" style="height: 1em"> <a href="{{page.manual}}">Bedienungsanleitung</a>
@@ -65,19 +67,19 @@ layout: default
        overflow: hidden;">
         <h4 style="font-family:sans-serif;">{{page.name}}</h4>
           <ul style="list-style-type:none;">
-          {% for hint in page.hints %}<li style="margin:15px 0;line-height:18pt;">{{hint}}</li>{% endfor %}
+          {% for hint in page.hints -%}<li style="margin:15px 0;line-height:18pt;">{{hint}}</li>{% endfor -%}
           </ul>
           <p style="text-align:center;margin:0">
-          {% for c in page.commandsigns %}
-            <a href="https://de.wikipedia.org/wiki/Gebotszeichen" target="_blank" style="background-image:none;"><img src="{{ site.url }}/assets/iso7010/{{ c}}.svg" alt="{{c}}" width="100"></a>
-          {% endfor %}
-          </p>
-
-          {% if page.safetybriefing %}
-            <div style="line-height: 18pt; margin:5px 0; width: 100%; min-height: 40pt; ">
-              <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ page.url }}briefing/">Einweisung</a>!</p>
-            </div>
-          {% endif %}
+          {% for c in page.commandsigns -%}
+            <a href="https://de.wikipedia.org/wiki/Gebotszeichen" target="_blank" style="background-image:none;"><img src="{{ site.url }}/assets/iso7010/{{c}}.svg" alt="{{c}}" width="100"></a>
+          {% endfor -%}</p>
+          <div class="not-in-print">
+            {% if page.safetybriefing -%}
+              <div style=" margin:5px 0; width: 100%; min-height: 40pt; ">
+                <span style="float: left; color: #e67206; font-size: 40pt; display:block; width: 50pt; height: 40pt; text-align:center; line-height: 40pt;">⚠</span><p style="vertical-align: middle;">Um dieses Gerät benutzen zu dürfen benötigst du eine <a href="{{ site.baseurl }}{{ page.url }}briefing/">Einweisung</a>!</p>
+              </div>
+            {% endif -%}
+          </div>
           <div class="url-for-print" style="float: left; margin-bottom:0px;">
             <div id="qrcode" style="width: 150px;"></div>
             <p><a href="{{ site.url }}{{ page.url }}">chaotikum.org</a></p>

assets/print.css

@@ -97,6 +97,7 @@ p, a, h1, h2, h3, h4 {
     column-count: 2;
     -webkit-column-count: 2;
     -moz-column-count: 2;
+    font-size: 10px;
   }
   .one {
     column-count: 1;