Skip to content

refactored navbar #238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rupal-2505 wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

refactored navbar #238

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f5520c0
refactoring navbar sticky
rupal-2505 Oct 5, 2022
ca4c4a4
refactoring navbar sticky
rupal-2505 Oct 5, 2022
cad5199
removed yarn lock file
rupal-2505 Oct 15, 2022
62f8a7d
fixed package.json
rupal-2505 Oct 15, 2022
49e71d1
fixed package.json
rupal-2505 Oct 15, 2022
3652cf4
removed vscode file
rupal-2505 Oct 15, 2022
af41724
fixed navbar height
rupal-2505 Oct 15, 2022
87a9d99
commit
rupal-2505 Oct 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion css/discord.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
}

body {
font: 16px 'Roboto', sans-serif;
box-sizing: border-box;
font-family: 'raleway';
font-size: 16px;
background-color: var(--color-bg);
}

Expand Down
8 changes: 7 additions & 1 deletion css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ body {
font-family: 'raleway';
background-color: var(--color-bg);
}
header {
position: sticky;
top: 0;
background-color: #1d1283;
Copy link

@RitikJaiswal75 RitikJaiswal75 Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use a css variable here

margin: 0px;
}

h1 {
font-size: 4.5rem;
Expand Down Expand Up @@ -282,7 +288,7 @@ footer {
@media (max-width: 1024px) {
.rds-logo-banner {
display: block;
margin: 25px auto 0px auto;
margin: 0px auto 0px auto;
}

h1 {
Expand Down
3 changes: 3 additions & 0 deletions css/navbar-linked-pages.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
nav {
font-weight: 700;
position: sticky;
top: 0;
background-color: #1d1283;
Copy link

@RitikJaiswal75 RitikJaiswal75 Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use css variable

}

nav li a {
Expand Down
20 changes: 11 additions & 9 deletions css/navbar.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
nav {
font-family: 'roboto';
font-weight: 700;
position: sticky;
top: 0;
background-color: #1d1283;
Copy link

@RitikJaiswal75 RitikJaiswal75 Oct 20, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

css variable please

}

.nav-menu {
Expand All @@ -15,16 +18,16 @@ nav li {
}

.rds-logo {
height: 100px;
width: 100px;
margin: 20px;
height: 80px;
width: 80px;
margin: 10px;
}

.nav-element {
display: block;
text-decoration: none;
color: #ffffff;
margin: 55px 40px;
margin: 40px 40px;
}

.nav-element.active-tab {
Expand All @@ -42,7 +45,7 @@ nav li {
position: absolute;
right: 0;
top: 0;
margin: 50px 40px;
margin: 40px 40px;
}

.btn-login-text {
Expand Down Expand Up @@ -114,21 +117,20 @@ nav li {

.hamburger {
display: inline-block;
margin: 20px;
margin: 10px;
cursor: pointer;
}

.nav-login {
margin: 20px 20px;
margin: 10px 10px;
}

nav li {
float: none;
}

.nav-element {
padding: 10px 40px;
margin: 10px;
padding: 10px 10px;
}

.nav-element.active-tab {
Expand Down
157 changes: 78 additions & 79 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,90 +32,89 @@
</head>

<body>
<div class="first-screen">
<header>
<div class="hamburger">
<div class="bar"></div>
<div class="bar"></div>
<div class="bar"></div>
</div>
<header>
<div class="hamburger">
<div class="bar"></div>
<div class="bar"></div>
<div class="bar"></div>
</div>

<nav class="main-nav">
<ul class="nav-menu">
<li>
<a href="https://www.realdevsquad.com/" class="logo-link">
<img
class="rds-logo"
src="img/logos/RDS-logo.png"
alt="RDS_Logo"
/>
</a>
</li>
<li>
<a
class="home-tab nav-element"
href="https://www.realdevsquad.com/"
>
Home
</a>
</li>
<li>
<a
class="nav-element active-tab"
href="https://welcome.realdevsquad.com/"
>
Welcome
</a>
</li>
<li>
<a
class="nav-element"
href="https://www.realdevsquad.com/events.html"
>
Events
</a>
</li>
<li>
<a class="nav-element" href="https://members.realdevsquad.com/">
Members
</a>
</li>
<li>
<a class="nav-element" href="https://crypto.realdevsquad.com/">
Crypto
</a>
</li>
<li>
<a class="nav-element" href="https://status.realdevsquad.com/">
Status
</a>
</li>
</ul>
</nav>

<div class="nav-login">
<a class="btn-login" id="user-login" href="">
<button class="btn-login-text">
<span class="btn-text1">Sign In</span>
<span class="btn-text2">with GitHub</span>
<nav class="main-nav">
<ul class="nav-menu">
<li>
<a href="https://www.realdevsquad.com/" class="logo-link">
<img
src="img/icons/github-logo.png"
alt="GitHub_Icon"
height="15px"
width="15px"
class="rds-logo"
src="img/logos/RDS-logo.png"
alt="RDS_Logo"
/>
</button>
</a>

<div class="user-greet">
<a href="https://my.realdevsquad.com/">
<div class="user-greet-msg">Hello, User!</div>
<img class="user-profile-pic" />
</a>
</div>
</div>
</header>
</li>
<li>
<a
class="home-tab nav-element"
href="https://www.realdevsquad.com/"
>
Home
</a>
</li>
<li>
<a
class="nav-element active-tab"
href="https://welcome.realdevsquad.com/"
>
Welcome
</a>
</li>
<li>
<a
class="nav-element"
href="https://www.realdevsquad.com/events.html"
>
Events
</a>
</li>
<li>
<a class="nav-element" href="https://members.realdevsquad.com/">
Members
</a>
</li>
<li>
<a class="nav-element" href="https://crypto.realdevsquad.com/">
Crypto
</a>
</li>
<li>
<a class="nav-element" href="https://status.realdevsquad.com/">
Status
</a>
</li>
</ul>
</nav>

<div class="nav-login">
<a class="btn-login" id="user-login" href="">
<button class="btn-login-text">
<span class="btn-text1">Sign In</span>
<span class="btn-text2">with GitHub</span>
<img
src="img/icons/github-logo.png"
alt="GitHub_Icon"
height="15px"
width="15px"
/>
</button>
</a>

<div class="user-greet">
<a href="https://my.realdevsquad.com/">
<div class="user-greet-msg">Hello, User!</div>
<img class="user-profile-pic" />
</a>
</div>
</div>
</header>
<div class="first-screen">
<img
class="rds-logo-banner"
src="img/logos/RDS-logo-2x.png"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"license": "ISC",
"devDependencies": {
"pre-commit": "^1.2.2",
"prettier": "2.2.1"
"prettier": "2.7.1"
},
"pre-commit": [
"check"
Expand Down
Loading