fix(forms): move fieldset and label styles to forms

telerik · Nov 5, 2020 · cabe003 · cabe003
1 parent 069aeed
commit cabe003
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 49 deletions.
diff --git a/packages/default/scss/forms/_layout.scss b/packages/default/scss/forms/_layout.scss
@@ -7,6 +7,56 @@
         line-height: $form-line-height;
     }
 
+
+    // Fieldset
+    .k-fieldset {
+        margin: $fieldset-margin;
+        border-width: 1px 0 0;
+        border-style: solid;
+        padding: 25px 0 0;
+
+        > legend {
+            margin-left: 0;
+            padding: 0 $padding-x 0 0;
+            text-transform: uppercase;
+        }
+    }
+
+
+    // Label
+    kendo-label > .k-label {
+        margin: 0;
+    }
+
+    .k-label-optional {
+        margin-left: $label-optional-margin-x;
+        font-size: $label-optional-font-size;
+        font-style: $label-optional-font-style;
+        align-self: center;
+    }
+
+    .k-label-empty {
+        &::before {
+            content: "";
+            display: inline-block;
+        }
+    }
+
+    .k-input-label {
+        margin-right: $horizontal-form-label-margin-x;
+        z-index: 1;
+
+        &:dir(rtl),
+        .k-rtl &,
+        &.k-rtl,
+        [dir="rtl"] &,
+        &[dir="rtl"] {
+            margin-right: 0;
+            margin-left: $horizontal-form-label-margin-x;
+        }
+    }
+
+
     // Vertical Form
     .k-form {
         border: 0;

diff --git a/packages/default/scss/input/_layout.scss b/packages/default/scss/input/_layout.scss
@@ -131,41 +131,6 @@
         flex-flow: row nowrap;
     }
 
-
-    // Fieldset
-    .k-fieldset {
-        margin: $fieldset-margin;
-        border-width: 1px 0 0;
-        border-style: solid;
-        padding: 25px 0 0;
-
-        > legend {
-            margin-left: 0;
-            padding: 0 $padding-x 0 0;
-            text-transform: uppercase;
-        }
-    }
-
-
-    // Label
-    kendo-label > .k-label {
-        margin: 0;
-    }
-
-    .k-label-optional {
-        margin-left: $label-optional-margin-x;
-        font-size: $label-optional-font-size;
-        font-style: $label-optional-font-style;
-        align-self: center;
-    }
-
-    .k-label-empty {
-        &::before {
-            content: "";
-            display: inline-block;
-        }
-    }
-
     .k-text-disabled {
         @include disabled( $disabled-styling );
     }
@@ -177,20 +142,6 @@
 
 @include exports("input/layout/jQuery-label") {
 
-    .k-input-label {
-        margin-right: $horizontal-form-label-margin-x;
-        z-index: 1;
-
-        &:dir(rtl),
-        .k-rtl &,
-        &.k-rtl,
-        [dir="rtl"] &,
-        &[dir="rtl"] {
-            margin-right: 0;
-            margin-left: $horizontal-form-label-margin-x;
-        }
-    }
-
 }