Merge branch 'update-forms' into update-forms-2

janfaracik · Dec 28, 2021 · ddef35f · ddef35f
2 parents 4846849 + e28f8a6
commit ddef35f
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 34 deletions.
diff --git a/war/src/main/less/base/style.less b/war/src/main/less/base/style.less
@@ -924,23 +924,56 @@ table.parameters > tbody:hover {
 
 /* ========================= editable combobox style ========================= */
 .comboBoxList {
-  overflow: visible;
-  background-color: var(--background);
+  overflow-y: scroll;
   color: var(--text-color);
-  border-radius: var(--form-input-border-radius);
-  box-shadow: 0 10px 20px rgba(black, 0.1);
+  border-radius: 10px;
+  box-shadow: 0 10px 20px rgba(black, 0.15);
+  margin-top: 8px;
+  margin-left: 3px;
+  max-height: 300px;
+  z-index: 1000;
+  background: var(--background);
+  padding: 0.3rem;
 }
 
-.comboBoxSelectedItem {
-  background-color: var(--primary);
-  color: var(--background);
+.comboBoxItem {
+  position: relative;
+  padding: 0.5rem 0.8rem;
+  cursor: pointer;
+  font-weight: 500;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    background: var(--text-color);
+    border-radius: 10px;
+    opacity: 0;
+    transition: var(--standard-transition);
+    z-index: -1;
+  }
+
+  &:hover {
+    &::before {
+      opacity: 0.1;
+    }
+  }
+
+  &:active,
+  &:focus {
+    &::before {
+      opacity: 0.2;
+    }
+  }
 }
 
 .combobox-values {
   display: none;
 }
 
-
 /* ========================= directory tree ========================= */
 .parentPath {
   font-size: var(--font-size-base);

diff --git a/war/src/main/less/modules/form.less b/war/src/main/less/modules/form.less
@@ -421,27 +421,46 @@
   clip: rect(0 0 0 0);
   clip-path: inset(50%);
 
-  &:focus + label:before, &:active + label:before {
-    border-width: 5px;
-    border-color: var(--focus-input-border);
-    box-shadow: var(--form-input-glow--focus);
-  }
+  &:checked {
+    & + label {
+      &:active,
+      &:focus {
+        &::before {
+          box-shadow: 0 0 0 5px var(--focus-input-glow), inset 0 0 0 12px var(--focus-input-border);
+        }
+      }
+    }
 
-  &:checked + label:before {
-    border: 11px solid var(--focus-input-border);
-  }
+    & + label {
+      &::before {
+        box-shadow: 0 0 0 10px transparent, inset 0 0 0 12px var(--focus-input-border);
+      }
 
-  &:checked + label:after {
-    transform: scale(1)!important;
+      &::after {
+        transform: scale(1);
+      }
+    }
   }
 
   &:disabled {
     & + label {
-      cursor: default;
-      pointer-events: none;
+      cursor: not-allowed;
 
       &::before {
-        opacity: 0.3 !important;
+        opacity: 0.35 !important;
+        box-shadow: 0 0 0 10px transparent, inset 0 0 0 2px var(--input-border) !important;
+      }
+    }
+
+    &:checked {
+      & + label {
+        &::before {
+          box-shadow: 0 0 0 10px transparent, inset 0 0 0 12px var(--focus-input-border) !important;
+        }
+
+        &::after {
+          transform: scale(1) !important;
+        }
       }
     }
   }
@@ -458,16 +477,15 @@
   font-weight: 600;
 
   &::before {
-    display: inline-block;
     content: "";
+    display: inline-block;
     position: relative;
     min-width: 22px;
     min-height: 22px;
-    border: 2px solid var(--input-border);
     border-radius: 6px;
-    transition: 0.2s ease;
+    transition: var(--standard-transition);
     margin-right: 11px;
-    box-shadow: 0 0 0 10px transparent;
+    box-shadow: 0 0 0 10px transparent, inset 0 0 0 2px var(--input-border);
   }
 
   &::after {
@@ -478,34 +496,33 @@
     position: absolute;
     top: 0;
     left: 0;
-    right: 0;
     width: 22px;
     height: 22px;
     background: var(--background);
     mask-image: url("data:image/svg+xml;charset=UTF-8,%3c?xml version='1.0' encoding='UTF-8'?%3e%3csvg width='384px' height='320px' viewBox='0 0 384 320' version='1.1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink'%3e%3ctitle%3ePath%3c/title%3e%3cg id='Page-1' stroke='none' stroke-width='1' fill='none' fill-rule='evenodd'%3e%3cpath d='M327.917546,10.9278525 C339.555371,-2.37251966 359.771775,-3.72027991 373.072147,7.91754577 C386.239516,19.4389932 387.692129,39.368305 376.427694,52.671077 L376.082454,53.0721475 L152.082454,309.072147 C140.014868,322.863675 118.889432,323.700972 105.767743,311.015951 L105.372583,310.627417 L9.372583,214.627417 C-3.12419433,202.13064 -3.12419433,181.86936 9.372583,169.372583 C21.7443926,157.000773 41.7261905,156.877055 54.2501999,169.001429 L54.627417,169.372583 L126.441,241.186 L327.917546,10.9278525 Z' id='Path' fill='%23FF0000' fill-rule='nonzero'%3e%3c/path%3e%3c/g%3e%3c/svg%3e");
     mask-size: 10px 10px;
     mask-repeat: no-repeat;
     mask-position: center;
-    transition: var(--standard-transition);
+    transition: 0.3s cubic-bezier(0, 0.68, 0.5, 1.5);
     transform: scale(0);
   }
 
-  &:hover {
+  &:empty {
     &::before {
-      border: 5px solid var(--input-border-hover);
+      margin-right: 0;
     }
   }
 
-  &:active, &:focus {
+  &:hover {
     &::before {
-      border: 5px solid var(--focus-input-border);
-      box-shadow: 0 0 0 5px var(--focus-input-glow);
+      box-shadow: 0 0 0 10px transparent, inset 0 0 0 5px var(--input-border-hover);
     }
   }
 
-  &:empty {
+  &:active,
+  &:focus {
     &::before {
-      margin-right: 0;
+      box-shadow: 0 0 0 5px var(--focus-input-glow), inset 0 0 0 5px var(--focus-input-border);
     }
   }
 }