Merge upstream changes

app/assets/stylesheets/halfnarp.css

@@ -134,6 +134,12 @@ body {
     clear: both;
 }
 
+.version {
+    position: absolute;
+    top: 4px;
+    right: 4px;
+}
+
 /* Our main event box */
 .event {
     overflow: hidden;
@@ -228,6 +234,21 @@ body {
     z-position: -3;
 }
 
+.wholeblock {
+    position: absolute;
+    width: 25%;
+    background-color: yellow;
+    opacity: 0.4;
+    z-position: -3;
+}
+.in-calendar.onlyday1 .wholeblock,
+.in-calendar.onlyday2 .wholeblock,
+.in-calendar.onlyday3 .wholeblock,
+.in-calendar.onlyday4 .wholeblock
+{
+    width: 100%;
+}
+
 .grid.over {
     background-color: lime;
 }
@@ -256,11 +277,25 @@ hr.guide {
 
 .ende, .pause {
     background-color: pink;
+    color: white;
+    text-align: center;
     left: 0;
     right: 0;
     z-position: -1;
 }
 
+.size-large .pause {
+    font-size: 9em;
+}
+
+.size-medium .pause {
+    font-size: 7em;
+}
+
+.size-small .pause {
+    font-size: 4em;
+}
+
 /* togglable view selectors */
 .absolute             .vhalf        { background: red; }
 .still-left           .vleft        { background: red; }
@@ -295,10 +330,10 @@ hr.guide {
 }
 
 /* Events in list that have a date set, will be marked */
-.in-list .event.day_1,
-.in-list .event.day_2,
-.in-list .event.day_3,
-.in-list .event.day_4 {
+.fullnarp.in-list .event.day_1,
+.fullnarp.in-list .event.day_2,
+.fullnarp.in-list .event.day_3,
+.fullnarp.in-list .event.day_4 {
     background-color: green;
     color: white;
 }
@@ -378,6 +413,18 @@ hr.guide {
     color: white;
 }
 
+/* Events in calendar where speakers are unavailable, will be marked */
+.in-calendar .conflict {
+    background-image:
+        repeating-linear-gradient(
+          45deg,
+          black,
+          black 20px,
+          yellow 20px,
+          yellow 40px /* determines size */
+        ) !important;
+    color: red;
+}
 
 /* FAQ */
 dt {
@@ -396,6 +443,15 @@ dl {
     display: none !important;
 }
 
+#qrcode {
+    display: inline-block;
+    float: right;
+
+    margin: 0 0.8em 0.8em 0;
+    width:  14em;
+    height: 14em;
+}
+
 *[draggable=true] {
   cursor: move;
 }
@@ -605,6 +661,7 @@ dl {
 .size-large .duration_7200  { height: 395px  !important; }
 .size-large .duration_8100  { height: 445px  !important; }
 .size-large .duration_inf   { height: 1600px !important; }
+.size-large .wholeblock     { height: 700px; }
 .size-large .wholeday       { height: 3550px; }
 .in-calendar.size-large .event { font-size: 0.8em; }
 
@@ -616,6 +673,7 @@ dl {
 .size-medium .duration_7200 { height: 237px  !important; }
 .size-medium .duration_8100 { height: 267px  !important; }
 .size-medium .duration_inf  { height: 960px !important; }
+.size-medium .wholeblock    { height: 420px; }
 .size-medium .wholeday      { height: 2150px; }
 .in-calendar.size-medium .event { font-size: 0.6em; }
 
@@ -627,6 +685,7 @@ dl {
 .size-small .duration_7200  { height: 158px  !important; }
 .size-small .duration_8100  { height: 178px  !important; }
 .size-small .duration_inf   { height: 640px !important; }
+.size-small .wholeblock    { height: 280px; }
 .size-small .wholeday       { height: 1450px; }
 .in-calendar.size-small .event { font-size: 0.4em; }