Skip to content

Commit

Permalink
Merge pull request #168 from pandeyji711/contributor
Browse files Browse the repository at this point in the history
rearrange about button and filter 1 contributor card as suggested
  • Loading branch information
mdazfar2 authored Jun 4, 2024
2 parents 4fefb2f + c077e9b commit 88a4a5b
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 59 deletions.
5 changes: 0 additions & 5 deletions Official_Website/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,11 @@
<img src="logo.png" alt="HelpOps-Hub Logo">
</div>
<div>

<h1>About Us</h1>
</div>


</header>
<nav class="nav " id="navbar">



<ul class="nav__list" id="navlinkitems">
<li class="nav__item">
<a href="contributor-index.html" class="fa-solid fa-people-group"></a>
Expand Down
13 changes: 3 additions & 10 deletions Official_Website/contributor-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
<header class="header">

<div class="logo">
<img src="logo.png" alt="HelpOps-Hub Logo">
<a href="https://helpops-hub.vercel.app/"
><img src="logo.png" alt="HelpOps-Hub Logo"
/></a>
</div>
<div>

Expand Down Expand Up @@ -72,15 +74,6 @@ <h1>HelpOps-Hub</h1>
<li class="nav__item">
<a href="javascript:void(0);" class="fas fa-adjust" onclick="toggleTheme()"></a>
</li>
<li>
<button class="about-button">

<a href="./about.html">
About Us
</a>
</button>

</li>
<li><button class="about-button">

<a href="./faq.html">
Expand Down
3 changes: 1 addition & 2 deletions Official_Website/contributor.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ async function fetchAllContributors() {
avatarImg.src = contributor.avatar_url;
avatarImg.alt = `${contributor.login}'s Picture`;
let name = contributor.name || contributor.login;

if (name.length > 12) {
name = name.slice(0, 10) + "...";
}
Expand Down Expand Up @@ -176,7 +175,7 @@ async function fetchAllContributors() {
</div>`;
// loginLink.appendChild(avatarImg);
// contributorCard.appendChild(loginLink);
if (cheak > 0) cont.appendChild(contributorCard);
if (cheak > 0 && name != "azfar-2") cont.appendChild(contributorCard);
cheak++;
});
} catch (error) {
Expand Down
41 changes: 32 additions & 9 deletions Official_Website/faq.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,35 @@
body{
overflow-y: scroll;
}
.about-button1 {
display: flex;
align-items: center;
color: black;
position: fixed;
bottom: 50px;
right: 50px;
color: #00ccff;
background-color: #00ccff;
box-shadow: 5px 5px 20px #00ccff;
border: none;
padding: 5px 5px;
border-radius: 8px; /* Rounded corners */
font-size: 16px; /* Text size */
cursor: pointer;
text-decoration: none;
transition: 0.5s;
}
.about-button1:hover {
transform: scale(1.2);
/* background-color: white; */
}
.about-button1 a{
text-decoration: none;
}
.nav_item {
text-decoration: none;
}

</style>
</head>
<body>
Expand Down Expand Up @@ -77,15 +106,6 @@ <h1>FAQ's</h1>
<li class="nav__item">
<a href="javascript:void(0);" class="fas fa-adjust" onclick="toggleTheme()"></a>
</li>
<li>
<button class="about-button">

<a href="./about.html">
About Us
</a>
</button>

</li>
<li><button class="about-button">

<a href="./index.html">
Expand Down Expand Up @@ -185,6 +205,9 @@ <h5 class="mb-0">
</div>
</div>
</div>
<button class="about-button1">
<a href="./about.html"> About Us </a>
</button>

<!-- jQuery and Bootstrap Bundle (includes Popper) -->
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"></script>
Expand Down
33 changes: 10 additions & 23 deletions Official_Website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ <h1>HelpOps-Hub</h1>
class="fas fa-adjust"
onclick="toggleTheme()"></a>
</li>
<li>
<button class="about-button">
<a href="./about.html"> About Us </a>
</button>
</li>
<li>
<button class="about-button">
<a href="./faq.html"> FAQ's </a>
Expand Down Expand Up @@ -108,32 +103,24 @@ <h1>HelpOps-Hub</h1>
</div>

<div id="maincontainer">
<div id="loading" class="loading-gears">
<svg
class="gear one"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 100 100">
<path
d="M78.9,50c0-1.6-0.1-3.1-0.2-4.6l9.4-7.2c0.7-0.5,0.9-1.5,0.4-2.2l-8.8-15.3c-0.5-0.7-1.5-0.9-2.2-0.4l-11,6.4
<div id="loading" class="loading-gears">
<svg class="gear one" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
<path d="M78.9,50c0-1.6-0.1-3.1-0.2-4.6l9.4-7.2c0.7-0.5,0.9-1.5,0.4-2.2l-8.8-15.3c-0.5-0.7-1.5-0.9-2.2-0.4l-11,6.4
c-2.4-1.8-5-3.3-7.9-4.4L57,9.4c-0.2-0.8-1-1.4-1.8-1.4H44.8c-0.8,0-1.6,0.6-1.8,1.4l-1.6,12.1c-2.9,1-5.5,2.5-7.9,4.4l-11-6.4
c-0.7-0.5-1.7-0.3-2.2,0.4l-8.8,15.3c-0.5,0.7-0.3,1.7,0.4,2.2l9.4,7.2c-0.1,1.5-0.2,3.1-0.2,4.6s0.1,3.1,0.2,4.6l-9.4,7.2
c-0.7,0.5-0.9,1.5-0.4,2.2l8.8,15.3c0.5,0.7,1.5,0.9,2.2,0.4l11-6.4c2.4,1.8,5,3.3,7.9,4.4l1.6,12.1c0.2,0.8,1,1.4,1.8,1.4h10.4
c0.8,0,1.6-0.6,1.8-1.4l1.6-12.1c2.9-1,5.5-2.5,7.9-4.4l11,6.4c0.7,0.5,1.7,0.3,2.2-0.4l8.8-15.3c0.5-0.7,0.3-1.7-0.4-2.2l-9.4-7.2
C78.8,53.1,78.9,51.6,78.9,50z M50,62.5c-6.9,0-12.5-5.6-12.5-12.5S43.1,37.5,50,37.5S62.5,43.1,62.5,50S56.9,62.5,50,62.5z" />
</svg>
<svg
class="gear two"
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 100 100">
<path
d="M78.9,50c0-1.6-0.1-3.1-0.2-4.6l9.4-7.2c0.7-0.5,0.9-1.5,0.4-2.2l-8.8-15.3c-0.5-0.7-1.5-0.9-2.2-0.4l-11,6.4
C78.8,53.1,78.9,51.6,78.9,50z M50,62.5c-6.9,0-12.5-5.6-12.5-12.5S43.1,37.5,50,37.5S62.5,43.1,62.5,50S56.9,62.5,50,62.5z"/>
</svg>
<svg class="gear two" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100">
<path d="M78.9,50c0-1.6-0.1-3.1-0.2-4.6l9.4-7.2c0.7-0.5,0.9-1.5,0.4-2.2l-8.8-15.3c-0.5-0.7-1.5-0.9-2.2-0.4l-11,6.4
c-2.4-1.8-5-3.3-7.9-4.4L57,9.4c-0.2-0.8-1-1.4-1.8-1.4H44.8c-0.8,0-1.6,0.6-1.8,1.4l-1.6,12.1c-2.9,1-5.5,2.5-7.9,4.4l-11-6.4
c-0.7-0.5-1.7-0.3-2.2,0.4l-8.8,15.3c-0.5,0.7-0.3,1.7,0.4,2.2l9.4,7.2c-0.1,1.5-0.2,3.1-0.2,4.6s0.1,3.1,0.2,4.6l-9.4,7.2
c-0.7,0.5-0.9,1.5-0.4,2.2l8.8,15.3c0.5,0.7,1.5,0.9,2.2,0.4l11-6.4c2.4,1.8,5,3.3,7.9,4.4l1.6,12.1c0.2,0.8,1,1.4,1.8,1.4h10.4
c0.8,0,1.6-0.6,1.8-1.4l1.6-12.1c2.9-1,5.5-2.5,7.9-4.4l11,6.4c0.7,0.5,1.7,0.3,2.2-0.4l8.8-15.3c0.5-0.7,0.3-1.7-0.4-2.2l-9.4-7.2
C78.8,53.1,78.9,51.6,78.9,50z M50,62.5c-6.9,0-12.5-5.6-12.5-12.5S43.1,37.5,50,37.5S62.5,43.1,62.5,50S56.9,62.5,50,62.5z" />
</svg>
</div>
C78.8,53.1,78.9,51.6,78.9,50z M50,62.5c-6.9,0-12.5-5.6-12.5-12.5S43.1,37.5,50,37.5S62.5,43.1,62.5,50S56.9,62.5,50,62.5z"/>
</svg>
</div>
</div>
<!-- <button id="scrollToTopBtn" class="scrollToTopBtn">▲</button> -->
<div id="folders-container"></div>
Expand Down
25 changes: 20 additions & 5 deletions Official_Website/navstyle.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
line-height: 16px;
font-weight: 700;
transition: color 0.1s, background-color 0.1s, padding 0.2s ease-in;
color: #111;
/* color: #111; */
text-decoration: none;
}

.nav-toggle {
Expand All @@ -59,6 +60,7 @@
bottom: 3px;
left: 0;
height: 3px;
text-decoration: none;
width: 100%;
background-color: #000;
transform-origin: right top;
Expand All @@ -74,6 +76,7 @@
.nav__link:focus::before {
transform-origin: left top;
transform: scale(1, 1);
text-decoration: none;
}
nav{
background-color: #00ccff;
Expand All @@ -98,6 +101,7 @@
a {
text-decoration: none;
color: #111;
text-decoration: none;
}

/* @media (max-width: 800px) {
Expand Down Expand Up @@ -157,21 +161,24 @@
right: 0.5rem;
top: 1.1rem;
/* left: 29rem; */
z-index: 1000;
/* z-index: 1000;
outline: none;
}
} */

.nav__link {
margin: 0;
color: #fff;
outline: none;
}
.nav__list{
gap: 20px;
align-items: end;
outline: none;
}
li button{
background-color: white;
color: black !important;
outline: none;
}
li button a{
color: #00ccff !important;
Expand All @@ -193,7 +200,9 @@
.nav-open .logo {
display: none;
}

*{
outline: none;;
}
.nav-open .hamburger {
transform: rotate(0.625turn);
background-color: #fff;
Expand Down Expand Up @@ -221,6 +230,7 @@
height: 3px;
border-radius: 1em;
transition: transform 250ms ease-in-out;
text-decoration: none;
}

.hamburger::before,
Expand Down Expand Up @@ -259,29 +269,34 @@

.nav__link:active::before {
background-color: #fff;
text-decoration: none;
}

.nav__link:hover::before,
.nav__link:focus::before {
transform-origin: left top;
transform: scale(1, 1);
text-decoration: none;
}
} */


section {
width: 100%;
display: flex;
margin: auto;
text-decoration: none;
align-items: center;
min-height: 110vh;
}

.one {
background-color: #fff;
text-decoration: none;
}

.two {
background-color: rgb(190, 183, 170);
text-decoration: none;
}

.three {
Expand Down
11 changes: 6 additions & 5 deletions Official_Website/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ header {
padding: 1rem;
}
/* loading */
.loading {
margin-top: 20px;
.loading{
margin-top:20px ;
font-size: x-large;
display: flex;
align-items: center;
Expand Down Expand Up @@ -148,10 +148,10 @@ header {

@keyframes spin {
0% {
transform: rotate(0deg);
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
transform: rotate(360deg);
}
}
/* .loading:after {
Expand Down Expand Up @@ -214,7 +214,7 @@ width: 40px;
font-size: 18px;
margin-bottom: 8px;
}
.about-button {
.about-button{
display: flex;
align-items: center;
color: black;
Expand All @@ -227,6 +227,7 @@ width: 40px;
cursor: pointer;
outline: none;
transition: 0.5s;
text-decoration: none;
}
.about-button:hover {
transform: scale(1.2);
Expand Down

0 comments on commit 88a4a5b

Please sign in to comment.