Skip to content

Commit

Permalink
Merge branch 'ANSHIKA-26:main' into name
Browse files Browse the repository at this point in the history
  • Loading branch information
akash70629 authored Oct 18, 2024
2 parents e54b033 + cec50eb commit fe35326
Show file tree
Hide file tree
Showing 10 changed files with 1,279 additions and 1,238 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/PRValidator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
id: check_issue_number
run: |
description="${{ github.event.pull_request.body }}"
if [[ ! "$description" =~ (Fixes #[0-9]+|Fixes #NEW) ]]; then
if [[ ! "$description" =~ (Fixes #[0-9])]]; then
echo "::error::PR description must contain an issue number or 'Fixes #NEW'"
exit 1
fi
fi
2 changes: 1 addition & 1 deletion Scroll_and_progressbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
background-color: #f8b5b5; /* Background color matching scrollbar track */
border-radius: 10px; /* Rounded corners */
box-shadow: inset 2px 2px 5px rgba(0, 0, 0, 0.2); /* Optional shadow for container */
position: fixed;
/* position: fixed; */
overflow: hidden;
}

Expand Down
8 changes: 5 additions & 3 deletions about.html
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
</head>

<body>
<nav style="margin-bottom: 4rem;">
<div class="progress-container">
<div class="progress-bar" id="progress-bar"></div>
</div>
Expand Down Expand Up @@ -106,7 +107,7 @@ <h2>WordWise</h2>
<a href="category.html">Categories</a>
<a href="about.html">About</a>
<a href="contact_us.html">Contact Us</a>
<a href="contact_us.html">Give Feedback</a>
<a href="give_feedback.html">Give Feedback</a>
</div>

<div class="dropdown">
Expand Down Expand Up @@ -393,12 +394,13 @@ <h2>Forgot Password</h2>

</header>
</div>
</nav>

<!--main-->
</main>
<!-- </main> -->

<!--mainn-->
<div class="about">
<div class="about" style="margin-top: 8rem;">
<div class="about-content">
<h1>About Us</h1>
<p>WordWise is a responsive, user-friendly blogging platform designed to enrich vocabulary and engage
Expand Down
87 changes: 55 additions & 32 deletions blog.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
</head>

<body>
<nav>
<div class="progress-container">
<div class="progress-bar" id="progress-bar"></div>
</div>
Expand Down Expand Up @@ -52,7 +53,7 @@ <h2>WordWise</h2>
<a href="category.html">Categories</a>
<a href="about.html">About</a>
<a href="contact_us.html">Contact Us</a>
<a href="contact_us.html">Give Feedback</a>
<a href="give_feedback.html">Give Feedback</a>
</div>


Expand Down Expand Up @@ -333,11 +334,12 @@ <h2>Forgot Password</h2>

</header>
</div>
</nav>

<!--header-->

<!--mainn-->
<main id="site-main">
<main id="site-main" style="margin-top: 8rem;">
<!--post content-->
<section class="container">
<!-- <div class="layout-2 row"> -->
Expand Down Expand Up @@ -686,41 +688,48 @@ <h5 class="commenter-name">${comment.name}</h5>
max-width: 48rem;
margin: 0 auto;
}

.section-title {
font-size: 2.25rem;
font-weight: 800;
text-align: center;
color: #111827;
margin-bottom: 48px;
}

font-size: 2.25rem;
font-weight: 800;
text-align: center;
color: #111827;
margin-bottom: 48px;

}

.title-text {
background-clip: text;
-webkit-background-clip: text;
color: #f4978e;
/* background-image: linear-gradient(to right, #f4978e); */
}

.comment-form {
margin-bottom: 64px;
background-color: white;
padding: 24px;
border-radius: 0.75rem;
box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05);
transition: all 0.3s;
}

margin: 64px auto;
background-color: transparent;
padding: 24px;
border-radius: 0.75rem;
box-shadow: 0 10px 20px var(--text-color);
transition: all 0.3s;

}

.comment-form:hover {
box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
}

.form-title {
font-size: 1.5rem;
font-weight: 700;
color: #1f2937;
margin-bottom: 24px;

font-size: 1.5rem;
font-weight: 700;
color: #3498db;
margin-bottom: 24px;

}


.form-content {
display: flex;
Expand All @@ -732,6 +741,17 @@ <h5 class="commenter-name">${comment.name}</h5>
position: relative;
}

.input-field {

width: 100%;
padding: 12px 16px;
border: 2px solid #d1d5db;
border-radius: 0.5rem;
transition: border-color 0.3s;
margin-top: 7px;

}

.input-field {
width: 100%;
padding: 12px 16px;
Expand Down Expand Up @@ -760,18 +780,21 @@ <h5 class="commenter-name">${comment.name}</h5>
top: -10px;
color: #f4978e;
}

.submit-button {
width: 100%;
color: #f4978e;
font-weight: 600;
padding: 12px 24px;
border-radius: 0.5rem;
border: none;
cursor: pointer;
transition: all 0.3s;
}

width: 100%;
color: #ffffff;
font-weight: 600;
padding: 12px 24px;
border-radius: 0.5rem;
border: none;
cursor: pointer;
transition: all 0.3s;
background-color: #3498db;

}

.submit-button:hover {
color: #f4978e;
transform: scale(1.05);
Expand Down
6 changes: 4 additions & 2 deletions category.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
</head>

<body>
<nav>
<div class="progress-container">
<div class="progress-bar" id="progress-bar"></div>
</div>
Expand Down Expand Up @@ -65,7 +66,7 @@ <h2>WordWise</h2>
<a href="category.html">Categories</a>
<a href="about.html">About</a>
<a href="contact_us.html">Contact Us</a>
<a href="contact_us.html">Give Feedback</a>
<a href="give_feedback.html">Give Feedback</a>
</div>

<div class="dropdown">
Expand Down Expand Up @@ -340,10 +341,11 @@ <h2>Forgot Password</h2>

</header>
</div>
</nav>
<!--header-->


<main>
<main style="margin-top: 8rem;">
<section class="category-container">
<div class="category-row">
<div class="new-category-box">
Expand Down
Loading

0 comments on commit fe35326

Please sign in to comment.