Merge branch 'master' into router-test-fixrouter-test-fix

3 files changed, 16 insertions, 8 deletions

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8f02c1f13..819bdf6fb 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@
 
 * [ ] Have you followed the guidelines in our [Contributing document](https://github.com/nasa/openmct/blob/master/CONTRIBUTING.md)?
 * [ ] Have you checked to ensure there aren't other open [Pull Requests](https://github.com/nasa/openmct/pulls) for the same update/change?
-* [ ] Is this change backwards compatible? Will users need to change how they are calling the API, or how they've extended core plugins such as Tables or Plots?
+* [ ] Is this change backwards compatible? For example, developers won't need to change how they are calling the API or how they've extended core plugins such as Tables or Plots.
 
 ### Author Checklist
 
diff --git a/src/plugins/conditionWidget/components/condition-widget.scss b/src/plugins/conditionWidget/components/condition-widget.scss
index 2c94b1359..c5b1f64e3 100644
--- a/src/plugins/conditionWidget/components/condition-widget.scss
+++ b/src/plugins/conditionWidget/components/condition-widget.scss
@@ -38,12 +38,16 @@ a.c-condition-widget {
 
 // Make Condition Widget expand when in a hidden frame Layout context
 // For both static and Flexible Layouts
-.c-so-view--no-frame > .c-so-view__object-view > .c-condition-widget {
-    @include abs();
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 0;
+.c-so-view--conditionWidget.c-so-view--no-frame {
+    .c-condition-widget {
+        @include abs();
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        padding: 0;
+    }
+
+    .c-so-view__frame-controls { display: none; }
 }
 
 // Add some margin when a Condition Widget is in a Flexible Layout
diff --git a/src/styles/_controls.scss b/src/styles/_controls.scss
index 7c6c56659..a8d17dcfc 100644
--- a/src/styles/_controls.scss
+++ b/src/styles/_controls.scss
@@ -453,12 +453,16 @@ select {
     }
 }
 
-.c-so-view--no-frame > .c-so-view__object-view > .c-hyperlink--button {
+.c-so-view--hyperlink.c-so-view--no-frame {
+  .c-hyperlink--button {
     @include abs();
     display: flex;
     align-items: center;
     justify-content: center;
     padding: 0;
+  }
+
+  .c-so-view__frame-controls { display: none; }
 }
 
 /******************************************************** MENUS */