Merge pull request #1288 from dradis/css/add-icons-stylesheet

Add icons.scss
dradis · Sep 17, 2024 · 06cd330 · 06cd330
2 parents a83fb02 + 0cc3c7b
commit 06cd330
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 15 deletions.
diff --git a/app/assets/stylesheets/shared/_icons.scss b/app/assets/stylesheets/shared/_icons.scss
@@ -0,0 +1,11 @@
+.fa-check {
+  color: $green;
+}
+
+.fa-info-circle {
+  color: $blue;
+}
+
+.fa-times {
+  color: $red;
+}
diff --git a/app/assets/stylesheets/shared/_validations.scss b/app/assets/stylesheets/shared/_validations.scss
@@ -1,29 +1,18 @@
 .validation {
-  .fa-check {
-    color: $green;
-  }
-
-  .fa-info-circle {
-    color: $blue;
-  }
-
-  .fa-times {
-    color: $red;
-  }
-
   &.validation-feed {
     .validation-list {
+      list-style-type: none;
       margin: 1rem 0 0;
       padding: 0;
 
       li {
         i {
-          margin-right: .15rem;
+          margin-right: 0.15rem;
         }
 
         .text-error {
           font-size: 90%;
-          margin: 0 0 .5rem 1.3rem;
+          margin: 0 0 0.5rem 1.6rem;
         }
 
         &:last-of-type .text-error {

diff --git a/app/assets/stylesheets/tylium.scss b/app/assets/stylesheets/tylium.scss
@@ -23,6 +23,7 @@
 @import 'shared/datatables';
 @import 'shared/editor_toolbar';
 @import 'shared/empty_state.scss';
+@import 'shared/icons';
 @import 'shared/inline_editable';
 @import 'shared/mixins';
 @import 'shared/noscript';

diff --git a/app/assets/stylesheets/tylium/modules/_dots-menu.scss b/app/assets/stylesheets/tylium/modules/_dots-menu.scss
@@ -10,7 +10,7 @@
 
   .dots-dropdown-header {
     font-weight: 400 !important;
-    
+
     &:hover {
       color: $linkColor !important;
       background-color: initial !important;
@@ -21,6 +21,10 @@
       margin-top: 0.3rem;
       padding-top: 0.3rem;
     }
+
+    &:not(:has(+ .dropdown-item)) {
+      display: none;
+    }
   }
 
   .dropdown-menu {