Commit 984893d8 by gaurav

conflicts fixed

2 parents 67e04c00 4d6b8c14
...@@ -18,7 +18,6 @@ const Card = ({ heading, data }) => { ...@@ -18,7 +18,6 @@ const Card = ({ heading, data }) => {
className="d-flex justify-content-center mb-4 mt-3" className="d-flex justify-content-center mb-4 mt-3"
> >
<div className={`custom-card ${item.CardClass}`}> <div className={`custom-card ${item.CardClass}`}>
{/* <h5 className="card-title">{item.Title}</h5> */}
<div className="card-image"> <div className="card-image">
<div className="card-badge">{item.Title}</div>{" "} <div className="card-badge">{item.Title}</div>{" "}
<div <div
...@@ -29,6 +28,15 @@ const Card = ({ heading, data }) => { ...@@ -29,6 +28,15 @@ const Card = ({ heading, data }) => {
<div className="overlay"></div> <div className="overlay"></div>
</div> </div>
</div> </div>
{/* <div className="card">
<div className="card-content1">
<div className="card">{item.Title} </div>
<div
className="Description"
dangerouslySetInnerHTML={{ __html: item.Description }}
/>
</div>
</div> */}
</Col> </Col>
))} ))}
</Row> </Row>
......
...@@ -98,10 +98,10 @@ const Blogs = () => { ...@@ -98,10 +98,10 @@ const Blogs = () => {
<li> <li>
<i className="ri-calendar-2-line"></i> {post.date} <i className="ri-calendar-2-line"></i> {post.date}
</li> </li>
<li> {/* <li>
<i className="ri-user-voice-line"></i> <i className="ri-user-voice-line"></i>
<Link href={post.authorLink}>{post.author}</Link> <Link href={post.authorLink}>{post.author}</Link>
</li> </li> */}
</ul> </ul>
<h3> <h3>
<Link href={post.detailsUrl}>{post.title}</Link> <Link href={post.detailsUrl}>{post.title}</Link>
......
...@@ -145,7 +145,7 @@ const Footer = () => { ...@@ -145,7 +145,7 @@ const Footer = () => {
<ul className="social-links"> <ul className="social-links">
<li> <li>
<a <a
href="https://www.facebook.com/advithconsulting/" href="https://www.facebook.com/advithitec/"
target="_blank" target="_blank"
> >
<i className="ri-facebook-fill"></i> <i className="ri-facebook-fill"></i>
...@@ -153,7 +153,7 @@ const Footer = () => { ...@@ -153,7 +153,7 @@ const Footer = () => {
</li> </li>
<li> <li>
<a <a
href="https://x.com/advith_consult?lang=en&mx=2" href="https://x.com/advithitec?lang=en"
target="_blank" target="_blank"
> >
<i className="ri-twitter-x-fill"></i> <i className="ri-twitter-x-fill"></i>
...@@ -161,7 +161,7 @@ const Footer = () => { ...@@ -161,7 +161,7 @@ const Footer = () => {
</li> </li>
<li> <li>
<a <a
href="https://www.linkedin.com/company/advith-consulting-llp/" href="https://www.linkedin.com/company/advith-itec-private-limited/?originalSubdomain=in"
target="_blank" target="_blank"
> >
<i className="ri-linkedin-fill"></i> <i className="ri-linkedin-fill"></i>
...@@ -169,7 +169,7 @@ const Footer = () => { ...@@ -169,7 +169,7 @@ const Footer = () => {
</li> </li>
<li> <li>
<a <a
href="https://www.instagram.com/advithconsulting/?hl=en" href="https://www.instagram.com/advithitec/?hl=en"
target="_blank" target="_blank"
> >
<i className="ri-instagram-line"></i> <i className="ri-instagram-line"></i>
...@@ -177,7 +177,7 @@ const Footer = () => { ...@@ -177,7 +177,7 @@ const Footer = () => {
</li> </li>
<li> <li>
<a <a
href="https://www.youtube.com/channel/UC7naGWMgKnpyKVKNCz5zGCg" href="https://www.youtube.com/@advithitecprivatelimited9001"
target="_blank" target="_blank"
> >
<i className="ri-youtube-line"></i> <i className="ri-youtube-line"></i>
......
...@@ -82,9 +82,9 @@ const blogs = ({Blogpage, conversionData }) => { ...@@ -82,9 +82,9 @@ const blogs = ({Blogpage, conversionData }) => {
<li> <li>
<i className="ri-calendar-2-line"></i> {post?.Date} <i className="ri-calendar-2-line"></i> {post?.Date}
</li> </li>
<li> {/* <li>
<i className="ri-user-voice-line"></i> {post?.Author} <i className="ri-user-voice-line"></i> {post?.Author}
</li> </li> */}
</ul> </ul>
<h3> <h3>
<Link href={`/blog/${post?.slug}`}>{post.Title}</Link> <Link href={`/blog/${post?.slug}`}>{post.Title}</Link>
......
...@@ -1787,6 +1787,7 @@ Services Area CSS ...@@ -1787,6 +1787,7 @@ Services Area CSS
display: -webkit-box; display: -webkit-box;
-webkit-line-clamp: 3; -webkit-line-clamp: 3;
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
word-spacing: -1.5px;
} }
.single-services-box .content .default-btn { .single-services-box .content .default-btn {
...@@ -3359,7 +3360,7 @@ Free Quote Area CSS ...@@ -3359,7 +3360,7 @@ Free Quote Area CSS
border-color: var(--blackColor); border-color: var(--blackColor);
} }
.free-quote-inner { /* .free-quote-inner {
position: relative; position: relative;
z-index: 1; z-index: 1;
background-image: url('../public/images/pagbanner.webp'); background-image: url('../public/images/pagbanner.webp');
...@@ -3367,6 +3368,17 @@ Free Quote Area CSS ...@@ -3367,6 +3368,17 @@ Free Quote Area CSS
background-position: center; background-position: center;
padding: 50px; padding: 50px;
overflow: hidden; overflow: hidden;
} */
.free-quote-inner {
position: relative;
z-index: 1;
background-image: url('../public/images/pagbanner.webp'); background-size: cover; /* better than inherit */
background-position: center;
background-attachment: scroll; /* moves with page scroll */
padding: 50px;
/* full screen */
overflow: hidden;
} }
/* /*
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!