Skip to content

Commit b678a9b

Browse files
FWF-5338:[V8Feature] - Edit settings page layout,
- Added Edit settings page layout, -Updated Nave bar theme glitches and animation -the settings page layout mixins can be used for edit action as well.
1 parent 6196171 commit b678a9b

File tree

6 files changed

+88
-16
lines changed

6 files changed

+88
-16
lines changed

forms-flow-nav/src/sidenav/Sidebar.scss

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,20 @@ $animSpeed: 300ms;
6464
position: fixed;
6565
z-index: 1050;
6666
left: 0;
67-
background-color: var(--navbar-bg-color);
67+
background-color: var(--nav-bg-color);
6868
display: flex;
6969
flex-direction: column;
7070
// justify-content: space-between;
7171
// box-shadow: var(--shadow-nav);
72+
transition: width 0.1s ease-in; // expand takes 3s
73+
74+
&:not(:hover) {
75+
transition: width 0.6s ease-out; // collapse takes 6s
76+
}
77+
78+
&:hover {
79+
width: var(--navbar-width); // expanded width
80+
}
7281

7382
.logo-container {
7483
display: flex;
@@ -102,7 +111,7 @@ $animSpeed: 300ms;
102111
padding-left: 0;
103112
// font-weight: 700;
104113

105-
background-color: var(--navbar-bg-color);
114+
background-color: var(--nav-bg-color);
106115
box-shadow: none;
107116

108117
&:focus {
@@ -130,7 +139,7 @@ $animSpeed: 300ms;
130139
// }
131140
@include font-style(0.938rem,500,var(--navbar-menu-font-color));
132141

133-
background-color: var(--navbar-bg-color);
142+
background-color: var(--nav-bg-color);
134143
box-shadow: none;
135144
}
136145

@@ -142,7 +151,7 @@ $animSpeed: 300ms;
142151
}
143152

144153
.accordion-item {
145-
background-color: var(--navbar-bg-color);
154+
background-color: var(--nav-bg-color);
146155
border: none;
147156
font-size: var(--font-size-sm);
148157
font-weight: var(--font-weight-sm);
@@ -311,7 +320,7 @@ $animSpeed: 300ms;
311320
// font-weight: var(--font-weight-sm);
312321
// line-height: var(--text-line-height);
313322
// letter-spacing: var(--text-space-xs);
314-
// background-color: var(--navbar-bg-color) !important;
323+
// background-color: var(--nav-bg-color) !important;
315324
// text-align: left;
316325
// margin-left: var(--spacer-050) !important;
317326
// margin: 0;
@@ -375,7 +384,7 @@ $animSpeed: 300ms;
375384
.multitenancy-header {
376385
height: var(--client-nav);
377386
box-shadow: var(--shadow-lg);
378-
background-color: var(--navbar-bg-color);
387+
background-color: var(--nav-bg-color);
379388
display: flex;
380389
align-items: center;
381390
padding: 0 var(--spacer-100);

forms-flow-theme/scss/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@
5757
@import "./v8-scss/table";
5858
@import "./v8-scss/checkbox";
5959
@import "./v8-scss/breadCrumbs";
60+
@import "./v8-scss/formEditSettings";

forms-flow-theme/scss/v8-scss/_formCreateLayout.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ $white-100-color: var(--white-100);
77
$gray-medium-dark-color: var(--gray-medium-dark);
88
$font-weight-medium: var(--font-weight-medium);
99

10-
.edit-setiings {
10+
.form-create-cards {
1111
@include mixins.vertical-padding();
1212
overflow: auto;
1313
//height: 80vh;
1414

1515
.create-header {
16-
@include mixins.font-style($header-font-size, $header-font-weight, );
16+
@include mixins.font-style($header-font-size, $header-font-weight );
1717
}
1818

1919
.create-from-scratch {
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
.form-edit-setiings {
2+
@include vertical-padding();
3+
overflow: auto;
4+
5+
.grid-section {
6+
@include grid-layout();
7+
@include vertical-padding();
8+
border-top: 1px solid $border-color;
9+
margin-top: 17px;
10+
margin-bottom: 18px;
11+
12+
.settings-header {
13+
grid-row: 1;
14+
@include section-header();
15+
}
16+
17+
.settings-contents {
18+
grid-row: 2;
19+
@include section-content();
20+
}
21+
}
22+
}

forms-flow-theme/scss/v8-scss/_mixins.scss

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ $font-color: var(--secondary-dark);
2626
border-bottom: none;
2727
transition:
2828
max-height 0.3s ease,
29-
padding 0.3s ease,
30-
border-bottom 0.3s ease;
29+
padding 0.5s ease,
30+
border-bottom 0.5s ease;
3131
&:not(:empty) {
3232
max-height: $maxHeight;
3333
padding: 1rem 0;
@@ -42,19 +42,20 @@ $font-color: var(--secondary-dark);
4242
width: 100%;
4343
}
4444

45+
//Align items at the flex center
4546
@mixin centerAlign {
4647
display: flex;
4748
align-items: center;
4849
justify-content: space-around;
4950
}
5051

52+
//vertical padding at the top and bottom.
5153
@mixin vertical-padding {
5254
padding: var(--spacer-100) 0 ;
5355
}
5456

5557

56-
//Settings Card Mixins
57-
58+
//----- Create form Card Mixins ------->
5859
@mixin create-grid($gap: 21px, $border-color: #E5E5E5, $padding: 18px 0) {
5960
display: grid;
6061
grid-template-columns: repeat(3, 1fr);
@@ -79,4 +80,42 @@ $font-color: var(--secondary-dark);
7980
border: 1px solid $hover-border;
8081
box-shadow: 0 0.125rem 0.5rem rgba(137, 105, 242, 0.15);
8182
}
82-
}
83+
}
84+
85+
//-------- Edit settings grid structure ----------->
86+
87+
@mixin grid-layout($header-height: 50px, $gap: 1rem) {
88+
display: grid;
89+
grid-template-rows: $header-height 1fr;
90+
gap: $gap;
91+
width: 100%;
92+
}
93+
94+
// Header section
95+
@mixin section-header(
96+
$border-color: #e5e5e5,
97+
$bg-color: #fff,
98+
$padding: 13px 0
99+
) {
100+
width: 100%;
101+
border-bottom: 1px solid $border-color;
102+
background-color: $bg-color;
103+
padding: $padding;
104+
}
105+
106+
// Content area
107+
@mixin section-content(
108+
$height: 300px,
109+
$padding: 34px 32px,
110+
$bg-color: #fff,
111+
$border-color: #e5e5e5,
112+
$radius: 5px
113+
) {
114+
width: 100%;
115+
height: $height;
116+
padding: $padding;
117+
background-color: $bg-color;
118+
border: 1px solid $border-color;
119+
border-radius: $radius;
120+
}
121+

forms-flow-theme/scss/v8-scss/_theme.scss

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ $font-tokens: (
9090
:root {
9191

9292
// //for navbar
93-
--nav-bg-color: var(-- white-100);
93+
94+
--nav-bg-color: var(--white-100);
9495
--navbar-menu-font-color: var(--secondary-dark);
9596
--navbar-submenu-font-color: var(--gray-dark);
9697

@@ -239,9 +240,9 @@ $font-tokens: (
239240
height: 100vh;
240241
display: flex;
241242
flex-direction: column;
242-
transition: width 0.3s ease;
243+
transition: width 0.5s ease;
243244
overflow: hidden;
244-
width: 12rem; // need to be replaced with variable
245+
width: var(--navbar-width);
245246
}
246247

247248
.page-container {

0 commit comments

Comments
 (0)