Merge branch 'master' into mobile-itc

src/plugins/timeConductor/conductor.scss

@@ -454,11 +454,13 @@
                 color: $colorTimeRealtimeFg;
             }
         }
-        .c-ctrl-wrapper--menus-up{ // A bit hacky, but we are rewriting the CSS class here for ITC such that the calendar opens at the bottom to avoid cutoff
+        body.desktop & {
-            .c-menu {
+            .c-ctrl-wrapper--menus-up{ // A bit hacky, but we are rewriting the CSS class here for ITC such that the calendar opens at the bottom to avoid cutoff. This is for DESKTOP-ONLY
-                top: auto;
+                .c-menu {
-                bottom: revert !important;
+                    top: auto;
-              };
+                    bottom: revert !important;
+                }
+            }
         }
     }
 }