Skip to content

Commit

Permalink
"Bootstrap 5 Migration - Rebuilt diffs"
Browse files Browse the repository at this point in the history
  • Loading branch information
millerdev committed Dec 12, 2024
1 parent b089038 commit 2f9365c
Showing 1 changed file with 20 additions and 12 deletions.
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
---
+++
@@ -1,356 +1,7 @@
@@ -1,356 +1,20 @@
-// FORM ACTIONS from TWBS 2
-// ------------
-
-[ng\:cloak],[ng-cloak],.ng-cloak{
- display:none !important
-}
-
+.field-label {
+ @extend .col-form-label, .col-12, .col-sm-4, .col-md-3, .col-lg-2;
}

-.form-actions {
- padding: (@line-height-base * @font-size-base - 1px) 0px @line-height-base * @font-size-base;
- margin-top: @line-height-base * 1em;
+.row > div > .form-check:first-child,
+.row > div > .input-group > .form-check:first-child {
+ padding-top: add($input-padding-y, $input-border-width);
margin-bottom: 0;
- margin-bottom: 0;
- background-color: @navbar-default-bg;
- border-top: 1px solid @legend-border-color;
- .border-bottom-radius(@border-radius-base);
Expand All @@ -31,12 +30,17 @@
- margin-left: 0;
- }
- }
-}
-
+.field-label + .field-control {
+ @extend .col-12, .col-sm-8, .col-md-9, .col-lg-10;
}

-.form-horizontal .control-label {
- text-align: left; // override bootstrap
-}
-
+:not(.field-label) + .field-control,
+.row > .field-control:first-child {
+ @extend .offset-sm-4, .offset-md-3, .offset-lg-2;
}

-legend .subtext {
- font-size: .8em;
- color: lighten(@cc-text, 40%);
Expand Down Expand Up @@ -357,10 +361,14 @@
-
-.controls-text {
- padding-top: 7px;
+.row > div > .form-check:first-child,
+.row > div > .input-group > .form-check:first-child {
+ padding-top: add($input-padding-y, $input-border-width);
+ margin-bottom: 0;
}

.form-hide-actions .form-actions {
@@ -361,21 +12,34 @@
@@ -361,21 +25,34 @@
.validationMessage {
display: block;
padding-top: 8px;
Expand Down

0 comments on commit 2f9365c

Please sign in to comment.