Skip to content

Commit 1861a38

Browse files
leecalcoteleecalcote
authored
Merge pull request #87 from chinmaym07/chinmaym07/navbar
Rectified Navbar & Some other views
2 parents 94f10e2 + 4af008a commit 1861a38

File tree

6 files changed

+128
-29
lines changed

6 files changed

+128
-29
lines changed

‎docs/_data/navigation.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
- name: Home
3+
link: /
4+
new_window: false
5+
highlight: false
6+
- name: About
7+
link: /about
8+
new_window: false
9+
highlight: false
10+
11+
- name: Docs
12+
link: /docs
13+
new_window: false
14+
highlight: false
15+
- name: Community
16+
link: https://layer5.io/community
17+
new_window: false
18+
highlight: false
19+
- name: GitHub
20+
link: https://github.com/layer5io/getnighthawk
21+
new_window: false
22+
highlight: false

‎docs/_includes/header.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,9 @@
6868
<li class="nav-item">
6969
<a href="/" class="nav-text">HOME</a>
7070
</li>
71+
<li class="nav-item">
72+
<a href="/about" class="nav-text">ABOUT</a>
73+
</li>
7174
<li class="nav-item">
7275
<a href="/docs" class="nav-text">DOCS</a>
7376
</li>

‎docs/_includes/navigation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<nav class="navmenu-container">
1+
<nav class="navmenu-container custom-nav-elem">
22
<div class="stellarnav">
33
<ul class="nav-list">
44
{% for link in site.data.navigation %}

‎docs/_sass/getnighthawk.scss

Lines changed: 49 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ $blue-munsell-3: #4392a4ff;
140140
.nighthawk-desc-text {
141141
display: inline-block;
142142
text-align: left;
143-
padding-top: 3rem;
144-
padding-left: 3rem;
143+
padding: 3rem 2rem;
145144
}
146145
.nighthawk-desc-text-meshery {
147146
display: inline-block;
@@ -157,12 +156,17 @@ $blue-munsell-3: #4392a4ff;
157156
padding-top: 1rem;
158157
}
159158
.nighthawk-meshery-logo {
160-
width: 446px;
161-
height: 410px;
162-
padding-left: 2rem;
159+
max-width: 100%;
160+
height: auto;
163161
}
164162
.nighthawk-meshery-div {
165-
margin-top: 7rem;
163+
margin: 2rem;
164+
165+
}
166+
.nighthawk-meshery-div-columns {
167+
padding: 5rem 2rem;
168+
max-width: 100%;
169+
height: auto;
166170
}
167171
.desc-h1 {
168172
font-size: 45px;
@@ -171,7 +175,7 @@ $blue-munsell-3: #4392a4ff;
171175
color: #000000;
172176
}
173177
.des-para {
174-
font-size: 20px;
178+
font-size: 19px;
175179
line-height: 10px;
176180
color:#737373;
177181
font-weight: 490;
@@ -5488,7 +5492,7 @@ a.globalFooterCard.card-environment, div.globalFooterCard.card-environment {
54885492
justify-content: center;
54895493
border-radius:5px;
54905494
margin:0rem 0.5rem;
5491-
height: 22rem;
5495+
height: 24rem;
54925496
box-shadow:0 0.5px 0.5px rgba(0, 0, 0, 0.4);
54935497

54945498
.card-head{
@@ -5498,7 +5502,7 @@ a.globalFooterCard.card-environment, div.globalFooterCard.card-environment {
54985502
}
54995503
}
55005504
.card-cust-body{
5501-
padding: 1rem 0rem;
5505+
55025506
margin-top: auto;
55035507
h4 , p{
55045508
padding: 0.5rem 1rem;
@@ -5687,4 +5691,40 @@ a.globalFooterCard.card-environment, div.globalFooterCard.card-environment {
56875691

56885692
.doc-heading {
56895693
margin-left: 20px;
5694+
}
5695+
@media only screen and (max-width:1200px){
5696+
.des-para {
5697+
font-size: 18px;
5698+
line-height: 10px;
5699+
color:#737373;
5700+
font-weight: 490;
5701+
margin-bottom: 20px;
5702+
}
5703+
.nighthawk-meshery-div-columns {
5704+
padding: 5rem 1rem;
5705+
}
5706+
}
5707+
@media only screen and (max-width:992px){
5708+
.nighthawk-desc-text {
5709+
padding: 4rem 1rem;
5710+
}
5711+
.des-para{
5712+
font-size: 20px;
5713+
}
5714+
.nighthawk-meshery-div-columns {
5715+
padding: 0;
5716+
}
5717+
.nighthawk-meshery-div
5718+
{
5719+
margin: 0 ;
5720+
}
5721+
5722+
}
5723+
@media only screen and (max-width:500px){
5724+
.nighthawk-desc-text {
5725+
padding: 4rem 0rem;
5726+
}
5727+
.des-para{
5728+
font-size: 14px;
5729+
}
56905730
}

‎docs/_sass/layout.scss

Lines changed: 39 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
header {
3232
color: $coolgray;
33-
padding: 25px 0;
33+
3434
// background: $brand-color; /* Old browsers */
3535
// background: linear-gradient(to bottom, $brand-color 0%, $middle-gradient-color 100%) no-repeat $brand-color;
3636
position: fixed;
@@ -74,7 +74,7 @@ header {
7474
.project-name {
7575
font-size: 1.7em;
7676
line-height: 0;
77-
padding: 0 20px;
77+
padding: 25px;
7878

7979
a {
8080
display: inline-flex;
@@ -460,12 +460,48 @@ hr {
460460
text-align: center;
461461
}
462462

463+
.custom-nav-elem{
464+
padding-top: 25px;
465+
}
466+
.custom-desc-cont{
467+
display: grid;
468+
grid-template-columns: 1fr 1fr 1fr;
469+
}
470+
.custom-desc-div {
471+
display: flex;
472+
padding: 5rem 0;
473+
}
463474

464-
475+
@media only screen and (max-width:992px){
476+
.custom-desc-div {
477+
display: flex;
478+
flex-direction: column;
479+
padding: 2rem;
480+
}
481+
}
465482
@media only screen and (max-width:768px)
466483
{
467484
.custom-nav-cont-1,.custom-nav-cont-2{
468485
display: none;
469486
}
470487

471488
}
489+
490+
@media only screen and (max-width: 476px){
491+
.custom-desc-cont{
492+
display: grid;
493+
grid-template-columns: 1fr 1fr;
494+
}
495+
.custom-desc-div {
496+
display: flex;
497+
flex-direction: column;
498+
padding: 0;
499+
}
500+
501+
}
502+
@media only screen and (max-width: 390px){
503+
.custom-desc-cont{
504+
display: grid;
505+
grid-template-columns: 1fr ;
506+
}
507+
}

‎docs/index.html

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,33 +58,31 @@
5858

5959
<div class="nighthawk-description-div">
6060
<div class="container">
61-
<div class="row description-div">
62-
<div class="col-lg-6">
63-
<div class="row">
64-
<div class="col-lg-4">
61+
<div class="custom-desc-div description-div">
62+
<div >
63+
<div class="custom-desc-cont">
64+
<div >
6565
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
6666
</div>
67-
<div class="col-lg-4">
67+
<div >
6868
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
6969
</div>
70-
<div class="col-lg-4">
70+
<div >
7171
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
7272
</div>
73-
</div>
74-
<div class="row">
75-
<div class="col-lg-4">
73+
<div >
7674
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
7775
</div>
78-
<div class="col-lg-4">
76+
<div >
7977
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
8078
</div>
81-
<div class="col-lg-4">
79+
<div >
8280
<img src="images/logos/nighthawk-description.png" class="nighthawk-desc-img" alt="logo">
8381
</div>
8482
</div>
8583
</div>
86-
<div class="col-lg-6 description-div">
87-
<div class="nighthawk-desc-text">
84+
<div class="description-div">
85+
<div class="nighthawk-desc-text desc-mob-view">
8886
<h1 class="desc-h1">What is Nighthawk?</h1><br>
8987
<p class="des-para">Nighthawk is a Layer 7 (HTTP/HTTPS/HTTP2)</p>
9088
<p class="des-para">performance characterization tool. Nighthawk</p>
@@ -95,8 +93,8 @@ <h1 class="desc-h1">What is Nighthawk?</h1><br>
9593
</div>
9694
<div class="nighthawk-meshery-div">
9795
<div class="container description-div">
98-
<div class="row">
99-
<div class="col-lg-6">
96+
<div class="custom-desc-div">
97+
<div class="nighthawk-meshery-div-columns">
10098
<div class="nighthawk-desc-text-meshery">
10199
<h1 class="desc-h1">Nighthawk and Meshery</h1><br><br>
102100
<p class="des-para">Meshery integrates Nighthawk as one of</p>
@@ -105,7 +103,7 @@ <h1 class="desc-h1">Nighthawk and Meshery</h1><br><br>
105103
<p class="des-para">of service meshes and their workloads.</p>
106104
</div>
107105
</div>
108-
<div class="col-lg-6">
106+
<div class="nighthawk-meshery-div-columns">
109107
<img src="images/logos/nighthawk-meshery.png" class="nighthawk-meshery-logo" alt="logo">
110108
</div>
111109
</div>

0 commit comments

Comments
 (0)