Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
sambedan1 authored Oct 27, 2024
2 parents 94e5048 + 52162e2 commit 22c67d6
Show file tree
Hide file tree
Showing 47 changed files with 383 additions and 58 deletions.
24 changes: 12 additions & 12 deletions Blog_page.html
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-1.jpg" alt = "">
<img src = "/src/images/art-design-1.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -347,7 +347,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-2.jpg" alt = "">
<img src = "/src/images/art-design-2.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -358,7 +358,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-3.jpg" alt = "">
<img src = "/src/images/art-design-3.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -369,7 +369,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-4.jpg" alt = "">
<img src = "/src/images/art-design-4.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -380,7 +380,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-5.jpg" alt = "">
<img src = "/src/images/art-design-5.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -391,7 +391,7 @@ <h2>Recent Designs</h2>

<div class = "design-item">
<div class = "design-img">
<img src = "/src/images/art-design-6.jpg" alt = "">
<img src = "/src/images/art-design-6.webp" alt = "">
<span><i class = "far fa-heart"></i> 22</span>
<span>Creative Canvas</span>
</div>
Expand All @@ -415,7 +415,7 @@ <h2>Latest Blog</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-1.jpg" alt = "">
<img src = "/src/images/blog-p-1.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand All @@ -428,7 +428,7 @@ <h2>Organizing the environment for productive work</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-2.jpg" alt = "">
<img src = "/src/images/blog-p-2.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand All @@ -441,7 +441,7 @@ <h2>Enhancing Creativity by Drawing</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-3.jpg" alt = "">
<img src = "/src/images/blog-p-3.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand All @@ -454,7 +454,7 @@ <h2>Organizing other household stuffs</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-4.jpg" alt = "">
<img src = "/src/images/blog-p-4.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand All @@ -467,7 +467,7 @@ <h2>Spreading greenery in house</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-5.jpg" alt = "">
<img src = "/src/images/blog-p-5.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand All @@ -480,7 +480,7 @@ <h2>Organizing the bed</h2>

<div class = "blog-item">
<div class = "blog-img">
<img src = "/src/images/blog-p-6.jpg" alt = "">
<img src = "/src/images/blog-p-6.webp" alt = "">
<span><i class = "far fa-heart"></i></span>
</div>
<div class = "blog-text">
Expand Down
61 changes: 45 additions & 16 deletions about-us.html
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,51 @@
</style>
</head>
<body>
<header>
<nav class="navbar">
<h1 class="site-name">Canvas Editor</h1>
<div class="nav-links">
<a href="index.html">Home</a>
<a href="about-us.html">About</a>
<a href="privacy.html">Privacy</a>
<a href="Blog_page.html">Blogs</a>
<a href="Faq.html">FAQ</a>
<a href="contributors.html">Contributors</a>
<a href="testimonial.html">Testimonial</a>
<a href="signup.html">Sign Up</a>
<a href="login.html">Login</a>
</div>
</nav>

<!-- Circles -->
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>
<div class="circle"></div>

<header class="header">
<nav class="navbar">
<div class="title">
<h1 class="site-name">Canvas Editor</h1>
<i class="fa-solid fa-paintbrush"></i>
</div>
<div class="nav-links">
<a href="index.html">Home</a>
<a href="about-us.html">About</a>
<a href="privacy.html">Privacy</a>
<a href="Blog_page.html">Blogs</a>
<a href="Faq.html">FAQ</a>
<a href="contributors.html">Contributors</a>
<a href="testimonial.html">Testimonial</a>
<a href="signup.html">Sign Up</a>
<a href="login.html">Login</a>
</div>
</nav>
</header>

<section class="about-section">

<div class="container">
<h2>About Creative Canvas Tool</h2>
<div class="first">
Expand Down Expand Up @@ -182,7 +211,7 @@ <h4>Somyadip Ghosh</h4>
</div>
</div>
</div>

</section>
<!-- Scroll Up Button -->
<button class="scroll-up" id="scrollUpBtn">&#8679;</button>

Expand Down
6 changes: 6 additions & 0 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@

<div class="container">
<div class="header text-center">

<h1 class="display-4" ">
<img src="download (1).webp" style="height: 100px; width: auto;
border-radius: 50px 50px 50px 50px ; margin-right: 70px;">

<a href="/" style="color: inherit; text-decoration: none;margin-bottom: 50px;">Creative Canvas Tool Build the future</a>
<img src="download (1).png" alt="Logo">
<h1>
<a href="/">Creative Canvas Tool - Build the Future</a>
Expand Down
Binary file removed download (1).png
Binary file not shown.
Binary file added download (1).webp
Binary file not shown.
Binary file removed feature.png
Binary file not shown.
Binary file added feature.webp
Binary file not shown.
Binary file removed gssocextd.jpg
Binary file not shown.
Binary file added gssocextd.webp
Binary file not shown.
Binary file removed hacktoberfest.png
Binary file not shown.
Loading

0 comments on commit 22c67d6

Please sign in to comment.