Merge branch 'beta-4.56.2' into alpha-4.56.2

homebridge · Apr 13, 2024 · 835947c · 835947c
2 parents 861fbb1 + e4d59c4
commit 835947c
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 17 deletions.
diff --git a/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html b/ui/src/app/core/manage-plugins/manage-plugins-modal/manage-plugins-modal.component.html
@@ -21,7 +21,7 @@ <h3 class="text-center primary-text" *ngIf="!isDisabled">
           {{ 'plugins.manage.message_thanks_for_updating_restart_child_bridges' | translate }}
         </p>
       </div>
-      <div class="alert show alert-info pt-3 px-3 pb-0 mb-0" *ngIf="changeLog">
+      <div class="alert pt-3 px-3 pb-0 mb-0" *ngIf="changeLog">
         <markdown class="plugin-md" [data]="changeLog"></markdown>
       </div>
     </div>
@@ -51,8 +51,8 @@ <h5 class="mb-0">
       </h5>
     </div>
     <h5>{{ 'plugins.manage.label_release_notes' | translate }}</h5>
-    <div class="alert show alert-info pt-3 px-3 pb-0 mb-0" style="word-wrap: break-word;">
-      <markdown class="plugin-md" [data]="release.changelog"></markdown>
+    <div class="alert pt-3 px-3 pb-0 mb-0">
+      <markdown class="plugin-md text-left" [data]="release.changelog"></markdown>
     </div>
   </div>
   <div class="modal-footer justify-content-between" *ngIf="!onlineUpdateOk || actionComplete || showReleaseNotes || actionFailed">

diff --git a/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss b/ui/src/app/modules/plugins/plugin-card/plugin-card.component.scss
@@ -1,8 +0,0 @@
-.dropdown-menu.show {
-  margin-top: 10px;
-  margin-bottom: 10px;
-}
-
-.dropup .dropdown-toggle:after {
-  display: none;
-}

diff --git a/ui/src/app/modules/setup-wizard/setup-wizard.component.html b/ui/src/app/modules/setup-wizard/setup-wizard.component.html
@@ -1,5 +1,5 @@
 <div class="setup-container d-flex align-items-center justify-content-center">
-  <div class="w-100 setup-card d-flex pb-5 pt-5">
+  <div class="w-100 setup-card d-flex py-5">
     <div *ngIf="step === 'welcome'" class="w-100 d-flex flex-column align-items-center">
       <img class="homebridge-logo mx-auto" src="/assets/homebridge-color-round.svg" alt="hb logo" />
       <h3 class="pt-4 pb-3 text-center">{{ 'setup_wizard.message_welcome_to_homebridge' | translate }}</h3>

diff --git a/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.html b/ui/src/app/modules/status/widgets/clock-widget/clock-widget.component.html
@@ -1,4 +1,4 @@
-<div class="flex-column d-flex align-items-stretch h-100 w-100 pb-3 pt-3">
+<div class="flex-column d-flex align-items-stretch h-100 w-100 py-3">
   <div class="d-flex flex-row flex-grow-1 align-items-center w-100  text-center">
     <div class="d-flex justify-content-around flex-wrap w-100">
       <div class="text-center widget-value-parent-wrap">
@@ -7,4 +7,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>
diff --git a/...c/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.html b/...c/app/modules/status/widgets/homebridge-logs-widget/homebridge-logs-widget.component.html
@@ -1,6 +1,6 @@
 <div #widgetcontainer class="flex-column d-flex align-items-stretch h-100 w-100" style="background-color:#2b2b2b;">
   <div #terminaltitle style="color:#ffffff; background-color: #2b2b2b;"
-    class="drag-handler ps-2 py-1 pe-2" [ngClass]="{ 'widget-cursor': widget.draggable }">
+    class="drag-handler px-2 py-1" [ngClass]="{ 'widget-cursor': widget.draggable }">
     {{ 'status.widget.label_homebridge_logs' | translate }}
   </div>
   <div [ngStyle]="{'height.px': terminalHeight}" class="p-2">

diff --git a/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.html b/ui/src/app/modules/status/widgets/terminal-widget/terminal-widget.component.html
@@ -1,6 +1,6 @@
 <div #widgetcontainer class="flex-column d-flex align-items-stretch h-100 w-100" style="background-color:#2b2b2b;">
   <div #terminaltitle style="color:#ffffff; background-color: #2b2b2b;"
-    class="drag-handler ps-2 py-1 pe-2" [ngClass]="{ 'widget-cursor': widget.draggable }">
+    class="drag-handler px-2 py-1" [ngClass]="{ 'widget-cursor': widget.draggable }">
     Homebridge {{ 'menu.docker.label_terminal' | translate }}
   </div>
   <div [ngStyle]="{'height.px': terminalHeight}" class="p-2">

diff --git a/ui/src/scss/themes/themes-dark.scss b/ui/src/scss/themes/themes-dark.scss
@@ -183,9 +183,10 @@
     .alert {
       color: #eeeeee;
       background-color: #2b2b2b;
+      border-color: #cccccc;
 
       a {
-        color: $secondaryBackground;
+        color: $darkModePrimary;
       }
     }
 

diff --git a/ui/src/scss/themes/themes-light.scss b/ui/src/scss/themes/themes-light.scss
@@ -157,6 +157,7 @@
     .alert {
       color: #000000;
       background-color: #eeeeee;
+      border-color: #cccccc;
 
       a {
         color: $primary;