From b6702b5ab43a7857d06038ec3ed03e2e441bd996 Mon Sep 17 00:00:00 2001 From: Sergey Andrievskiy Date: Wed, 19 Jun 2019 20:14:15 +0300 Subject: [PATCH] refactor(form inputs): remove bootstrap grid from cards --- .../form-inputs/form-inputs.component.html | 145 +++++++----------- .../form-inputs/form-inputs.component.scss | 41 ++--- 2 files changed, 71 insertions(+), 115 deletions(-) diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.html b/src/app/pages/forms/form-inputs/form-inputs.component.html index 3e5e1004..c40a0b6d 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.html +++ b/src/app/pages/forms/form-inputs/form-inputs.component.html @@ -3,44 +3,20 @@ Default Inputs -
- -
-
-
- -
-
- -
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- -
-
- + +
+ +
+ + + + + + + + +
@@ -50,71 +26,60 @@ Select -
- - Option 1 - Option 2 - -
+ + Option 1 + Option 2 +
Validation States -
- -
-
- -
-
- -
-
- -
-
- Success Checkbox - Warning Checkbox - Danger Checkbox + + + + + +
+ Success Checkbox + Warning Checkbox + Danger Checkbox
Checkboxes & Radios - -
-
- Checkbox 1 - Checkbox 2 -
-
- - - Radio 1 - - - Radio 2 - - - Radio 3 - - -
-
- Disabled Checkbox - - - Disabled Radio - - -
+ +
+ Checkbox 1 + Checkbox 2 +
+
+ + + Radio 1 + + + Radio 2 + + + Radio 3 + + +
+
+ Disabled Checkbox + + + Disabled Radio + +
diff --git a/src/app/pages/forms/form-inputs/form-inputs.component.scss b/src/app/pages/forms/form-inputs/form-inputs.component.scss index e4c3700c..f3fbf932 100644 --- a/src/app/pages/forms/form-inputs/form-inputs.component.scss +++ b/src/app/pages/forms/form-inputs/form-inputs.component.scss @@ -1,35 +1,26 @@ nb-card-body { overflow: visible; + padding-top: 0; + + > * { + margin-top: 1rem; + } } -.input-group { - margin-bottom: 1rem; -} - +.full-name-inputs, .validation-checkboxes { display: flex; - justify-content: space-between; + margin: 0 -0.5rem; + + > * { + margin: 0 0.5rem; + } +} + +.checkbox-radio { + display: flex; } .demo-items { - display: flex; - flex-direction: column; - margin-bottom: 1rem; -} - -.demo-checkboxes-radio { - display: flex; - justify-content: space-between; -} - -.full-name-inputs { - display: flex; -} - -.dropdown-menu { - width: auto; -} - -.form-group label { - padding: 0 0 0.75rem; + flex: 1 0 33%; }