Skip to content

Commit efb2348

Browse files
committed
Nav displacement fix for below 767 and up to 1200
1 parent 75361b9 commit efb2348

File tree

2 files changed

+36
-11
lines changed

2 files changed

+36
-11
lines changed

public/css/app.css

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,36 @@ Light Red #c97474
6767
border-radius:50%;
6868
margin-top:1%;
6969
}
70+
@media (max-width: 1200px) {
71+
#nav-right-1200fix {
72+
padding-left: 0;
73+
}
74+
}
7075

71-
76+
@media (max-width: 995px) {
77+
#nav-right-1200fix {
78+
padding-left: 0;
79+
font-size:15px;
80+
padding-right:0px;
81+
}
82+
#nav-1200-fix {
83+
font-size:15px;
84+
padding-right:0px;
85+
}
86+
#avatar-nav {
87+
padding-left: 3px;
88+
}
89+
}
7290
@media (max-width: 900px) {
7391
#avatar-nav {
74-
width:45px; height:auto; border-radius:50%; margin-top:0%; margin-left:5%;
92+
display: none;
93+
}
94+
}
95+
96+
97+
@media (max-width: 767px) {
98+
#nav-right-1200fix {
99+
padding-left: 15px;
75100
}
76101
}
77102

resources/views/layouts/master.blade.php

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,18 +69,18 @@
6969
</div>
7070
<div id="navbar" class="collapse navbar-collapse">
7171
<ul class="nav navbar-nav">
72-
<li><a href="/home">Home</a></li>
73-
<li><a href="/about">About</a></li>
74-
<li><a href="/contact">Contact</a></li>
75-
<li><a href="/project_library">Browse Projects</a></li>
72+
<li><a href="/home" id="nav-1200-fix">Home</a></li>
73+
<li><a href="/about" id="nav-1200-fix">About</a></li>
74+
<li><a href="/contact" id="nav-1200-fix">Contact</a></li>
75+
<li><a href="/project_library" id="nav-1200-fix">Browse Projects</a></li>
7676
</ul>
77-
<ul class="nav navbar-nav navbar-right">
78-
<li><a href="\new_project">New Project</a></li>
79-
<li><a href="{{ url('/logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();">Logout</a></li>
77+
<ul class="nav navbar-nav navbar-right" id="">
78+
<li><a href="\new_project" id="nav-right-1200fix" id="nav-1200-fix">New Project</a></li>
79+
<li><a href="{{ url('/logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();" id="nav-1200-fix">Logout</a></li>
8080
<form id="logout-form" action="{{ url('/logout') }}" method="POST" style="display: none;"> {{ csrf_field() }}
8181
</form>
82-
<li><a href="/user/{{Auth::user()->id}}">My Profile</a></li>
83-
<a href="/user/{{Auth::user()->id}}"><img class="av-nav" src="/uploads/avatars/{{ Auth::user()->avatar }} " id="avatar-nav" ></a>
82+
<li><a href="/user/{{Auth::user()->id}}" id="nav-1200-fix">My Profile</a></li>
83+
<a href="/user/{{Auth::user()->id}}" id="nav-1200-fix"><img class="av-nav" src="/uploads/avatars/{{ Auth::user()->avatar }} " id="avatar-nav" ></a>
8484
</ul>
8585
</div><!--/.nav-collapse -->
8686
</div>

0 commit comments

Comments
 (0)