Merge branch 'master' into tweak-plan-view

Plan view final sanding for Build 4
- Removed unused selector; - Changed class pointer for "no-activites" labels, refined text;
2021-03-02 15:31:22 -08:00 · 2021-03-02 15:21:20 -08:00 · 2021-03-02 15:20:33 -08:00
2 changed files with 2 additions and 6 deletions
--- a/src/plugins/plan/Plan.vue
+++ b/src/plugins/plan/Plan.vue
@@ -383,9 +383,9 @@ export default {
            this.setNSAttributesForElement(textElement, {
                x: "10",
                y: "20",
-                class: "no-activities"
+                class: "activity-label--outside-rect"
            });
-            textElement.innerHTML = 'No activities at this time';
+            textElement.innerHTML = 'No activities within timeframe';

            svgElement.appendChild(textElement);
        },
--- a/src/ui/components/swim-lane/swimlane.scss
+++ b/src/ui/components/swim-lane/swimlane.scss
@@ -16,10 +16,6 @@
        grid-column: span 2;
    }

-    [class*='--span-rows'] {
-        grid-row: span 4;
-    }
-
    &__lane-object {
        background: rgba(black, 0.1);
Author	SHA1	Message	Date
Charles Hacskaylo	8b77066532	Merge branch 'master' into tweak-plan-view	2021-03-02 15:31:22 -08:00
charlesh88	977b41c64b	Plan view final sanding for Build 4 - Removed unused selector; - Changed class pointer for "no-activites" labels, refined text;	2021-03-02 15:21:20 -08:00
charlesh88	e91e6b01c7	Plan view final sanding for Build 4 - Removed unused selector; - Changed class pointer for "no-activites" labels, refined text;	2021-03-02 15:20:33 -08:00