@@ -27,7 +27,7 @@ const getStyles = ($isShowNavBarRedesign?: boolean) => {
27
27
padding : 0 ,
28
28
display : 'flex' ,
29
29
justifyContent : 'center' ,
30
- width : $isShowNavBarRedesign ? '439px ' : '620px' ,
30
+ width : $isShowNavBarRedesign ? '648px ' : '620px' ,
31
31
minWidth : '400px' ,
32
32
} ,
33
33
} ;
@@ -48,17 +48,25 @@ const Header = styled(Layout)<{ $isNavBarCollapsed?: boolean; $isShowNavBarRedes
48
48
background-color: transparent;
49
49
height: ${ ( props ) => ( props . $isShowNavBarRedesign ? '56px' : '72px' ) } ;
50
50
display: flex;
51
- ${ ( props ) => {
52
- if ( ! props . $isShowNavBarRedesign ) return '' ;
53
- return `padding-left: ${ props . $isNavBarCollapsed ? '68px;' : '270px' } ;` ;
54
- } }
55
51
${ ( props ) =>
56
52
props . $isShowNavBarRedesign &&
57
53
`
58
54
margin-top: 8px;
59
55
gap: 16px;
60
56
flex-direction: row;
61
- transition: padding 250ms ease-in-out;
57
+
58
+ // preventing of NavBar's overlapping
59
+ position: relative;
60
+ padding-left: ${ props . $isNavBarCollapsed ? '224px' : '540px' } ;
61
+ left: ${ props . $isNavBarCollapsed ? '-112px' : '-270px' } ;
62
+ transition: none;
63
+ @media only screen and (min-width: 1280px) {
64
+ padding-left: 540px;
65
+ left: -270px;
66
+ }
67
+ @media only screen and (max-width: 1200px) {
68
+ transition: padding 250ms ease-in-out;
69
+ }
62
70
` }
63
71
${ ( props ) => props . $isShowNavBarRedesign && ! props . $isNavBarCollapsed && 'justify-content: space-between;' }
64
72
align-items: center;
@@ -76,10 +84,10 @@ const SearchBarContainer = styled.div<{ $isShowNavBarRedesign?: boolean }>`
76
84
display: flex;
77
85
flex: 1;
78
86
align-items: center;
87
+ justify-content: center;
79
88
${ ( props ) =>
80
89
! props . $isShowNavBarRedesign &&
81
90
`
82
- justify-content: center;
83
91
margin-left: 80px;
84
92
margin-top: 6px;
85
93
` }
@@ -106,6 +114,11 @@ const StyledButton = styled(Button)`
106
114
}
107
115
` ;
108
116
117
+ const NavBarTogglerWrapper = styled . div `
118
+ position: fixed;
119
+ left: 68px;
120
+ ` ;
121
+
109
122
type Props = {
110
123
initialQuery : string ;
111
124
placeholderText : string ;
@@ -140,7 +153,11 @@ export const SearchHeader = ({
140
153
< HeaderBackground $isShowNavBarRedesign = { isShowNavBarRedesign } />
141
154
< Wrapper $isShowNavBarRedesign = { isShowNavBarRedesign } >
142
155
< Header $isShowNavBarRedesign = { isShowNavBarRedesign } $isNavBarCollapsed = { isCollapsed } >
143
- { isShowNavBarRedesign && isCollapsed && < NavBarToggler /> }
156
+ { isShowNavBarRedesign && isCollapsed && (
157
+ < NavBarTogglerWrapper >
158
+ < NavBarToggler />
159
+ </ NavBarTogglerWrapper >
160
+ ) }
144
161
< SearchBarContainer $isShowNavBarRedesign = { isShowNavBarRedesign } >
145
162
< SearchBar
146
163
isLoading = { isUserInitializing || ! appConfig . loaded }
0 commit comments