Work in progress

RaphaelGauthier · Feb 29, 2024 · 785d776 · 785d776
1 parent 38b4ca7
commit 785d776
Show file tree

Hide file tree

Showing 10 changed files with 118 additions and 134 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm b/webapp/sources/rudder/rudder-web/src/main/elm/sources/Accounts/ViewModals.elm
@@ -83,7 +83,7 @@ displayModals model =
                   , textarea [id "newAccount-description", class "form-control vresize float-inherit", value account.description, onInput (\s -> UpdateAccountForm {account | description = s} )][]
                   ]
                 , div [class "form-group"]
-                  [ label [for "newAccount-expiration"]
+                  [ label [for "newAccount-expiration", class "mb-1"]
                     [ text "Expiration date"
                     , label [for "selectDate", class "custom-toggle toggle-secondary"]
                       [ input [type_ "checkbox", id "selectDate", checked account.expirationDateDefined, onCheck (\c ->  UpdateAccountForm {account | expirationDateDefined = c} )][]

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/_rudder-variables.scss
@@ -40,6 +40,7 @@ $rudder-success : #13BEB7;
 $rudder-primary : #337ab7;
 $rudder-warning : #EF9600;
 $rudder-danger  : #DA291C;
+$rudder-info    : #337AB7;
 
 // --- POLICY MODE
 $rudder-audit   : #1384BE;

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-bootstrap.scss
@@ -44,13 +44,15 @@ $primary    : $rudder-primary;
 $success    : $rudder-success;
 $warning    : $rudder-warning;
 $danger     : $rudder-danger;
+$info       : $rudder-info;
 
 $body-color : $rudder-txt-primary;
 $link-color : $rudder-txt-link;
 
 $nav-underline-border-width : 0.2rem;
 $nav-underline-link-active-color: $rudder-txt-primary;
 
+$font-size-root: 14px;
 $input-font-size-sm: 12px;  // previous bootstrap 3 value VS 0.85rem default in bootstrap 5
 
 @import "../../node_modules/bootstrap/scss/bootstrap";
@@ -98,16 +100,17 @@ $input-font-size-sm: 12px;  // previous bootstrap 3 value VS 0.85rem default in
 }
 // --- FORM-GROUP
 .form-group{
-  margin-bottom: 5px;
+  margin-bottom: 10px;
   label{
-    font-weight: bold;
+    font-weight: 500;
   }
 }
 // --- NAV & TABS
 .nav-underline {
   padding: 0 15px;
   margin-bottom: 0;
   position: relative;
+  min-height: 2px;
 
   &:before {
     content: "";

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-compliance.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-compliance.scss
@@ -349,7 +349,7 @@ $small-prefix : "sm-";
   & .icon-state {
     margin-right: 6px;
   }
-  & > i{
+  & > i:not(:last-child){
     margin-right: 4px;
   }
 }
diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-elm-datepicker.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-elm-datepicker.css
@@ -43,6 +43,7 @@ button.form-control.btn-datepicker:disabled {
 .elm-datepicker-container{
   display: flex;
   flex-direction: column;
+  flex: 1;
 }
 .elm-datepicker-container .form-control{
   cursor: pointer;

diff --git a/...web/src/main/style/rudder/rudder-main.css → ...eb/src/main/style/rudder/rudder-main.scss b/...web/src/main/style/rudder/rudder-main.css → ...eb/src/main/style/rudder/rudder-main.scss
@@ -294,7 +294,6 @@ pre.json-beautify code.elmsh {
 .content-wrapper {
   height: auto;
   padding-top:50px;
-  font-size: 12px;
 }
 @media (max-width: 767px){
   .content-wrapper {
@@ -2801,6 +2800,110 @@ ul.dropdown-menu.dropdown-compliance > li {
 ul.dropdown-menu.dropdown-compliance > li > span:last-child {
   font-weight: bold;
 }
+
+/* OS ICONS */
+$node-logo-size: 50px;
+
+.os-logo {
+  width: $node-logo-size;
+  height: $node-logo-size;
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+  opacity: 0.5;
+  margin-right: 10px;
+  cursor: help;
+  background-image: url(../../images/os/unknown-logo.svg);
+
+  @media (max-width: 992px){
+    &  {
+      display: none !important
+    }
+  }
+
+  &.linux{
+    background-image: url(../../images/os/linux-logo.svg);
+  }
+  &.debian{
+    background-image: url(../../images/os/debian-logo.svg);
+  }
+  &.kali{
+    background-image: url(../../images/os/kali-logo.svg);
+  }
+  &.ubuntu{
+    background-image: url(../../images/os/ubuntu-logo.svg);
+  }
+  &.redhat{
+    background-image: url(../../images/os/redhat-logo.svg);
+  }
+  &.centos{
+    background-image: url(../../images/os/centos-logo.svg);
+  }
+  &.fedora{
+    background-image: url(../../images/os/fedora-logo.svg);
+  }
+  &.suse{
+    background-image: url(../../images/os/suse-logo.svg);
+  }
+  &.android{
+    background-image: url(../../images/os/android-logo.svg);
+  }
+  &.oracle{
+    background-image: url(../../images/os/oracle-logo.svg);
+  }
+  &.scientific{
+    background-image: url(../../images/os/scientific-logo.svg);
+  }
+  &.slackware{
+    background-image: url(../../images/os/slackware-logo.svg);
+  }
+  &.mint{
+    background-image: url(../../images/os/mint-logo.svg);
+  }
+  &.rockylinux{
+    background-image: url(../../images/os/rocky-logo.svg);
+  }
+  &.almalinux{
+    background-image: url(../../images/os/alma-logo.svg);
+  }
+  &.raspbian{
+    background-image: url(../../images/os/raspbian-logo.svg);
+  }
+  &.windowsxp,
+  &.windowsvista,
+  &.windowsseven,
+  &.windows10,
+  &.windows2000,
+  &.windows2003,
+  &.windows2008,
+  &.windows2008r2{
+    background-image: url(../../images/os/windows-logo.svg);
+  }
+  &.windows,
+  &.windows2012,
+  &.windows2012r2,
+  &.windows2016,
+  &.windows2016r2,
+  &.windows2019{
+    background-image: url(../../images/os/windows-2012-logo.svg);
+  }
+  &.windows2022{
+    background-image: url(../../images/os/windows-2012-logo.svg);
+  }
+  &.aix{
+    background-image: url(../../images/os/aix-logo.svg);
+  }
+  &.solaris{
+    background-image: url(../../images/os/solaris-logo.svg);
+  }
+  &.bsd{
+    background-image: url(../../images/os/bsd-logo.svg);
+  }
+  &.freebsd{
+    background-image: url(../../images/os/freebsd-logo.svg);
+  }
+}
+
 /* KEYFRAMES */
 @-webkit-keyframes text-radio-on {
   0%   {color: #646464;}

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-node.scss
@@ -40,7 +40,6 @@
 
 // Variables
 $node-state-size: 14px;
-$node-logo-size: 50px;
 
 // Override Rudder template
 .rudder-template {
@@ -214,108 +213,6 @@ $node-logo-size: 50px;
   height: 20px;
 }
 
-/* OS ICONS */
-.os-logo {
-  width: $node-logo-size;
-  height: $node-logo-size;
-  background-size: contain;
-  background-repeat: no-repeat;
-  background-position: center;
-  opacity: 0.5;
-  margin-right: 10px;
-  cursor: help;
-  background-image: url(../../images/os/unknown-logo.svg);
-
-  @media (max-width: 992px){
-    &  {
-      display: none !important
-    }
-  }
-
-  &.linux{
-    background-image: url(../../images/os/linux-logo.svg);
-  }
-  &.debian{
-    background-image: url(../../images/os/debian-logo.svg);
-  }
-  &.kali{
-    background-image: url(../../images/os/kali-logo.svg);
-  }
-  &.ubuntu{
-    background-image: url(../../images/os/ubuntu-logo.svg);
-  }
-  &.redhat{
-    background-image: url(../../images/os/redhat-logo.svg);
-  }
-  &.centos{
-    background-image: url(../../images/os/centos-logo.svg);
-  }
-  &.fedora{
-    background-image: url(../../images/os/fedora-logo.svg);
-  }
-  &.suse{
-    background-image: url(../../images/os/suse-logo.svg);
-  }
-  &.android{
-    background-image: url(../../images/os/android-logo.svg);
-  }
-  &.oracle{
-    background-image: url(../../images/os/oracle-logo.svg);
-  }
-  &.scientific{
-    background-image: url(../../images/os/scientific-logo.svg);
-  }
-  &.slackware{
-    background-image: url(../../images/os/slackware-logo.svg);
-  }
-  &.mint{
-    background-image: url(../../images/os/mint-logo.svg);
-  }
-  &.rockylinux{
-    background-image: url(../../images/os/rocky-logo.svg);
-  }
-  &.almalinux{
-    background-image: url(../../images/os/alma-logo.svg);
-  }
-  &.raspbian{
-    background-image: url(../../images/os/raspbian-logo.svg);
-  }
-  &.windowsxp,
-  &.windowsvista,
-  &.windowsseven,
-  &.windows10,
-  &.windows2000,
-  &.windows2003,
-  &.windows2008,
-  &.windows2008r2{
-    background-image: url(../../images/os/windows-logo.svg);
-  }
-  &.windows,
-  &.windows2012,
-  &.windows2012r2,
-  &.windows2016,
-  &.windows2016r2,
-  &.windows2019{
-    background-image: url(../../images/os/windows-2012-logo.svg);
-  }
-  &.windows2022{
-    background-image: url(../../images/os/windows-2012-logo.svg);
-  }
-  &.aix{
-    background-image: url(../../images/os/aix-logo.svg);
-  }
-  &.solaris{
-    background-image: url(../../images/os/solaris-logo.svg);
-  }
-  &.bsd{
-    background-image: url(../../images/os/bsd-logo.svg);
-  }
-  &.freebsd{
-    background-image: url(../../images/os/freebsd-logo.svg);
-  }
-}
-
-
 .callout-fade.callout-info p .fa{
   margin-right: 5px;
   color: #1b809e;

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder-template.scss
@@ -468,6 +468,9 @@ ul {
   position: relative;
   display: flex;
 }
+.sidebar-navbar + .rudder-template .filters-container{
+  border-top : none !important;
+}
 .rudder-template .filters-container > div{
   flex: 1;
 }
@@ -577,21 +580,10 @@ ul {
 .rudder-template .main-details .nav-underline{
   margin: 0 -15px;
 }
-.rudder-template .sidebar-navbar ul{
+.rudder-template .sidebar-navbar ul {
   margin: 10px -15px 0px -15px;
-  padding: 0 15px;
-}
-.rudder-template .sidebar-navbar ul > li{
-  margin-right: 15px;
-  padding: 0 0 6px 0;
 }
 
-.rudder-template .sidebar-navbar ul > li > a{
-  padding: 0;
-  background-color: transparent !important;
-  border: none !important;
-  cursor: pointer;
-}
 .rudder-template .main-navbar ul > li > .fa-times {
   color: #72829d;
   padding: 3px 4px;

diff --git a/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css b/webapp/sources/rudder/rudder-web/src/main/style/rudder/rudder.css
@@ -1211,10 +1211,6 @@ table.directiveGroupDef, table.directiveVarDef, table.directiveSectionDef {
   margin:10px 0 0 15px;
 }
 
-.form-group select {
-  width: auto;
-}
-
 .animate-hide {
   -webkit-transition: all linear .2s;
   transition: all linear .2s;
@@ -1232,19 +1228,10 @@ table.directiveGroupDef, table.directiveVarDef, table.directiveSectionDef {
   display:block!important;
 }
 
-input[type="number"] {
-    padding: 5px 0 5px 5px;
-    margin-top:-5px;
-}
-
 .c3-tooltip td.name {
     padding-right: 3px;
 }
 
-.filterIcon {
-  margin-bottom:-3px;
-}
-
 .ui-button-disabled  {
     opacity: 0.5;
 }

diff --git a/.../rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html b/.../rudder/rudder-web/src/main/webapp/templates-hidden/components/ComponentRuleEditForm.html
@@ -321,7 +321,7 @@ <h4 class="modal-title">
                                remote-url-data-field="data" title-field="value" input-class="form-control input-sm input-key"
                                match-class="highlight" input-changed="updateTag" override-suggestions="true">
                           </div>
-                          <span class="input-group-addon addon-json">=</span>
+                          <span class="input-group-text addon-json">=</span>
                           <div id="directiveFilterValueInput" angucomplete-alt="" placeholder="value" minlength="1" maxlength="100"
                                pause="500" selected-object="selectValue" remote-url="{{contextPath}}/secure/api/completion/tags/directive/value/{{newTag.key}}/"
                                remote-url-data-field="data" title-field="value" input-class="form-control input-sm input-value" match-class="highlight"