Merge pull request #691 from sonaliTekdi/webapp_changes

Resolved sticky footer issue
NIUANULP · Oct 10, 2024 · cc5989d · cc5989d
2 parents c05033f + 9b4d71e
commit cc5989d
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 14 deletions.
diff --git a/packages/nulp_elite/src/components/VotingDrawerFilter.js b/packages/nulp_elite/src/components/VotingDrawerFilter.js
@@ -228,7 +228,7 @@ const VotingDrawerFilter = ({ onFilterChange }) => {
           </Box>
           <FormControl>
             <InputLabel htmlFor="outlined-adornment-search">
-            {t("SEARCH_FOR_A_POLL")}
+            {t("SEARCH_FOR_A_POLL")} 
             </InputLabel>
             <OutlinedInput
               id="outlined-adornment-search"

diff --git a/packages/nulp_elite/src/pages/FAQPage.js b/packages/nulp_elite/src/pages/FAQPage.js
@@ -62,7 +62,7 @@ const FAQPage = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       {setLanguage && url && <Container maxWidth="xl" role="main" className="min-472 pb-30">
         {error && (
           <Alert severity="error" className="my-10">

diff --git a/packages/nulp_elite/src/pages/connections/AddConnections.js b/packages/nulp_elite/src/pages/connections/AddConnections.js
@@ -1289,7 +1289,7 @@ const AddConnections = () => {
     <Box>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container maxWidth="xl" role="main" className="pt-0 xs-pb-62 pt-108">
         {error && (
           <Alert severity="error" className="my-10">

diff --git a/packages/nulp_elite/src/pages/content/AllContent.js b/packages/nulp_elite/src/pages/content/AllContent.js
@@ -309,7 +309,7 @@ const AllContent = () => {
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
 
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}
+     <Box
      >
      {domain ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} />

diff --git a/packages/nulp_elite/src/pages/content/CategoryPage.js b/packages/nulp_elite/src/pages/content/CategoryPage.js
@@ -248,7 +248,7 @@ const CategoryPage = () => {
   return (
     <>
       <Header />
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+     <Box>
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
       {domain.length > 0 ? (
         <DomainCarousel onSelectDomain={handleDomainFilter} domains={domain} selectedDomainCode={preselectedDomain}/>

diff --git a/packages/nulp_elite/src/pages/content/joinCourse.js b/packages/nulp_elite/src/pages/content/joinCourse.js
@@ -629,9 +629,8 @@ const JoinCourse = () => {
                     onClick={handleLeaveCourseClick} // Open confirmation dialog
                     className="custom-btn-danger xs-mt-10"
                   > {t("LEAVE_COURSE")}
-
                   </Button>
-                )}
+                }
               </Box>
             </div>
 

diff --git a/packages/nulp_elite/src/pages/content/pdf.js b/packages/nulp_elite/src/pages/content/pdf.js
@@ -20,7 +20,7 @@ const PDFContent = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container maxWidth="md" role="main" className="container-pb">
         <Grid container spacing={2}>
           <Grid item xs={8}>

diff --git a/packages/nulp_elite/src/pages/events/dashboard.js b/packages/nulp_elite/src/pages/events/dashboard.js
@@ -552,7 +552,7 @@ const Dashboard = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <Container
         maxWidth="xl"
         role="main"

diff --git a/packages/nulp_elite/src/pages/events/eventList.js b/packages/nulp_elite/src/pages/events/eventList.js
@@ -280,7 +280,7 @@ const EventList = (props) => {
     <div>
       <Header globalSearchQuery={globalSearchQuery} />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-     <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+     <Box>
       <Box>
         {domainList && domainList.length > 0 ? (
           <DomainCarousel

diff --git a/packages/nulp_elite/src/pages/profile/certificate.js b/packages/nulp_elite/src/pages/profile/certificate.js
@@ -196,7 +196,7 @@ const Certificate = () => {
       <Box className="lg-hide">
         <Header />
       </Box>
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
       <Container
         maxWidth="xxl"

diff --git a/packages/nulp_elite/src/pages/search/ContentList.js b/packages/nulp_elite/src/pages/search/ContentList.js
@@ -409,7 +409,7 @@ const ContentList = (props) => {
     <div>
       <Header globalSearchQuery={globalSearchQuery} />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
 
       <Box
         className="lg-hide header-bg"

diff --git a/packages/nulp_elite/src/pages/search/DomainList.js b/packages/nulp_elite/src/pages/search/DomainList.js
@@ -409,7 +409,7 @@ const DomainList = ({ globalSearchQuery }) => {
     <div>
       <Header />
       {toasterMessage && <ToasterCommon response={toasterMessage} />}
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY: 'auto' }}>
+      <Box>
 
         {/* Search Box */}
         <Box

diff --git a/packages/nulp_elite/src/pages/voting/pollsDetails.js b/packages/nulp_elite/src/pages/voting/pollsDetails.js
@@ -143,7 +143,7 @@ const pollsDetailes = () => {
   return (
     <div>
       <Header />
-      <Box sx={{ height: 'calc(100vh - 210px)', overflowY:'auto' }}>
+      <Box>
       <div>
         {polls.length === 0 ? (
           <p>{t("NO_POLL_AVAILABLE")}</p>