From 764044ad3a564d6a289a3adb8441da17f8769f80 Mon Sep 17 00:00:00 2001 From: Sunny Kumar Date: Tue, 22 Aug 2023 19:32:34 +0530 Subject: [PATCH 1/4] fix: search bar --- client/src/components/marginals/DesktopNavbar.js | 10 +++++++--- client/src/components/marginals/MobileNavbar.js | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/src/components/marginals/DesktopNavbar.js b/client/src/components/marginals/DesktopNavbar.js index 361f9857..7f52b287 100644 --- a/client/src/components/marginals/DesktopNavbar.js +++ b/client/src/components/marginals/DesktopNavbar.js @@ -70,6 +70,11 @@ const DesktopNavbar = () => { inputRef={inputRef} color='primary' InputProps={{ + sx: { + "& input": { + paddingLeft: "20px" + } + }, endAdornment: ( @@ -234,7 +239,6 @@ const useStyles = makeStyles((theme) => ({ searchField: { width: '100%', color: theme.palette.primary.blue50, - paddingBottom: '0px', }, trendingArticles: { position: 'absoulte', @@ -254,18 +258,18 @@ const useStyles = makeStyles((theme) => ({ position: 'absolute', background: '#FEFEFF', width: '100%', - padding: '20px', zIndex: '20022', borderRadius: '0px 0px 5px 5px', border: '1px #ECEDEC', borderStyle: 'none solid solid', boxShadow: '0px 0px 5px grey', display: (_) => (_.isSearchActive ? 'block' : 'none'), + paddingLeft: "20px" }, trendingList: { fontFamily: theme.typography.fontFamily, alignItems: 'center', - paddingBottom: '8px', + paddingBottom: '12px', paddingTop: '8px', cursor: 'pointer', }, diff --git a/client/src/components/marginals/MobileNavbar.js b/client/src/components/marginals/MobileNavbar.js index 2e87d386..011f0edd 100644 --- a/client/src/components/marginals/MobileNavbar.js +++ b/client/src/components/marginals/MobileNavbar.js @@ -81,6 +81,11 @@ const MobileNavbar = () => { placeholder='Search for articles' color='primary' InputProps={{ + sx: { + '& input': { + paddingLeft: '20px', + }, + }, endAdornment: ( @@ -278,7 +283,6 @@ const useStyles = makeStyles((theme) => ({ searchField: { width: '100%', color: theme.palette.primary.blue50, - paddingBottom: '0px', }, trendingArticles: { position: 'absoulte', @@ -301,13 +305,13 @@ const useStyles = makeStyles((theme) => ({ position: 'absolute', background: '#FEFEFF', width: '100%', - padding: '20px', zIndex: '20022', borderRadius: '0px 0px 5px 5px', border: '1px #ECEDEC', borderStyle: 'none solid solid', boxShadow: '0px 0px 5px grey', display: (_) => (_.isSearchActive ? 'block' : 'none'), + paddingLeft: '20px', }, trendingList: { fontFamily: theme.typography.fontFamily, From 754240a8854e47b777ca67edb3c221f4e3d27445 Mon Sep 17 00:00:00 2001 From: Sunny Kumar Date: Tue, 22 Aug 2023 19:36:25 +0530 Subject: [PATCH 2/4] fix: serach bar --- client/src/components/marginals/MobileNavbar.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/components/marginals/MobileNavbar.js b/client/src/components/marginals/MobileNavbar.js index 011f0edd..1f038d28 100644 --- a/client/src/components/marginals/MobileNavbar.js +++ b/client/src/components/marginals/MobileNavbar.js @@ -316,7 +316,7 @@ const useStyles = makeStyles((theme) => ({ trendingList: { fontFamily: theme.typography.fontFamily, alignItems: 'center', - paddingBottom: '8px', + paddingBottom: '12px', paddingTop: '8px', cursor: 'pointer', }, From 87180325ee7f704fe424a89ef7015d2287dec0f6 Mon Sep 17 00:00:00 2001 From: Sunny Kumar Date: Wed, 23 Aug 2023 16:07:46 +0530 Subject: [PATCH 3/4] fix: search bar --- client/src/components/marginals/DesktopNavbar.js | 10 ++++------ client/src/components/marginals/MobileNavbar.js | 8 +++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/client/src/components/marginals/DesktopNavbar.js b/client/src/components/marginals/DesktopNavbar.js index 7f52b287..a49711f5 100644 --- a/client/src/components/marginals/DesktopNavbar.js +++ b/client/src/components/marginals/DesktopNavbar.js @@ -70,11 +70,6 @@ const DesktopNavbar = () => { inputRef={inputRef} color='primary' InputProps={{ - sx: { - "& input": { - paddingLeft: "20px" - } - }, endAdornment: ( @@ -239,6 +234,9 @@ const useStyles = makeStyles((theme) => ({ searchField: { width: '100%', color: theme.palette.primary.blue50, + '& input': { + paddingLeft: '20px', + }, }, trendingArticles: { position: 'absoulte', @@ -264,7 +262,7 @@ const useStyles = makeStyles((theme) => ({ borderStyle: 'none solid solid', boxShadow: '0px 0px 5px grey', display: (_) => (_.isSearchActive ? 'block' : 'none'), - paddingLeft: "20px" + paddingLeft: '20px', }, trendingList: { fontFamily: theme.typography.fontFamily, diff --git a/client/src/components/marginals/MobileNavbar.js b/client/src/components/marginals/MobileNavbar.js index 1f038d28..d64cb83f 100644 --- a/client/src/components/marginals/MobileNavbar.js +++ b/client/src/components/marginals/MobileNavbar.js @@ -81,11 +81,6 @@ const MobileNavbar = () => { placeholder='Search for articles' color='primary' InputProps={{ - sx: { - '& input': { - paddingLeft: '20px', - }, - }, endAdornment: ( @@ -283,6 +278,9 @@ const useStyles = makeStyles((theme) => ({ searchField: { width: '100%', color: theme.palette.primary.blue50, + '& input': { + paddingLeft: '20px', + }, }, trendingArticles: { position: 'absoulte', From e49b0f5651f78cceab63ca250fe14484844fc87b Mon Sep 17 00:00:00 2001 From: SUNNY KUMAR Date: Tue, 17 Oct 2023 11:43:25 +0530 Subject: [PATCH 4/4] fix: searchbar --- client/src/components/marginals/DesktopNavbar.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/client/src/components/marginals/DesktopNavbar.js b/client/src/components/marginals/DesktopNavbar.js index a49711f5..419600f4 100644 --- a/client/src/components/marginals/DesktopNavbar.js +++ b/client/src/components/marginals/DesktopNavbar.js @@ -122,12 +122,16 @@ const DesktopNavbar = () => { + Search for articles + + ), endAdornment: ( @@ -278,4 +282,7 @@ const useStyles = makeStyles((theme) => ({ height: '100vh', opacity: '0.7', }, + searchlable:{ + width:"19%" + } }));