From bbeaa49d47f7330829ccad32ff6ee51ec830902f Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <luixxiul@users.noreply.github.com>
Date: Tue, 13 Aug 2024 11:08:14 -0400
Subject: [PATCH] Move up style rules for better cascading order

---
 Duplicati/Server/webroot/ngax/less/base.less | 101 ++++++++++---------
 1 file changed, 51 insertions(+), 50 deletions(-)

diff --git a/Duplicati/Server/webroot/ngax/less/base.less b/Duplicati/Server/webroot/ngax/less/base.less
index ca1d12c87..058cc9c9a 100644
--- a/Duplicati/Server/webroot/ngax/less/base.less
+++ b/Duplicati/Server/webroot/ngax/less/base.less
@@ -1303,6 +1303,57 @@ body {
                     }
                 }
 
+                /* TODO: merge these blocks with below */
+                div.add,
+                div.restore {
+                    --legends-width: 700px;
+                    --legends-padding-left: calc(calc(700px - var(--legends-width)) / 2);
+                    --circle-width: 43px;
+                    --step-width: calc(var(--legends-width) / var(--legends-steps));
+
+                    .steps {
+                        margin-left: calc(calc(calc(var(--step-width) - var(--circle-width)) / 2) + var(--legends-padding-left));
+
+                        .step {
+                            padding-left: calc(var(--step-width) - var(--circle-width));
+                            padding-right: 0;
+
+                            &:first-child {
+                                padding-inline: 0;
+                            }
+                        }
+                    }
+
+                    .steps-legend {
+                        padding-left: var(--legends-padding-left);
+
+                        li {
+                            width: var(--step-width);
+                        }
+                    }
+                }
+
+                div.add {
+                    --legends-steps: 5;
+                }
+
+                div.restore {
+                    --legends-steps: 2;
+
+                    &.restore-direct {
+                        --legends-steps: 4;
+
+                        .step:first-child {
+                            padding-left: 0;
+                            background: transparent;
+                        }
+
+                        .steps-legend {
+                            padding-left: 20px;
+                        }
+                    }
+                }
+
                 div.add,
                 div.restore {
                     .steps {
@@ -1713,56 +1764,6 @@ body {
                     }
                 }
 
-                div.add,
-                div.restore {
-                    --legends-width: 700px;
-                    --legends-padding-left: calc(calc(700px - var(--legends-width)) / 2);
-                    --circle-width: 43px;
-                    --step-width: calc(var(--legends-width) / var(--legends-steps));
-
-                    .steps {
-                        margin-left: calc(calc(calc(var(--step-width) - var(--circle-width)) / 2) + var(--legends-padding-left));
-
-                        .step {
-                            padding-left: calc(var(--step-width) - var(--circle-width));
-                            padding-right: 0;
-
-                            &:first-child {
-                                padding-inline: 0;
-                            }
-                        }
-                    }
-
-                    .steps-legend {
-                        padding-left: var(--legends-padding-left);
-
-                        li {
-                            width: var(--step-width);
-                        }
-                    }
-                }
-
-                div.add {
-                    --legends-steps: 5;
-                }
-
-                div.restore {
-                    --legends-steps: 2;
-
-                    &.restore-direct {
-                        --legends-steps: 4;
-
-                        .step:first-child {
-                            padding-left: 0;
-                            background: transparent;
-                        }
-
-                        .steps-legend {
-                            padding-left: 20px;
-                        }
-                    }
-                }
-
                 div.headerthreedotmenu {
                     margin: 20px 0 20px 0;