Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modified navigation-bar #11053

Merged
merged 3 commits into from
May 7, 2022
Merged

Modified navigation-bar #11053

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70aaff8
GIT CHECKOUT
simransia Apr 13, 2022
e4d8840
Improved responsiveness
simransia Apr 15, 2022
2606e61
third commit
simransia Apr 16, 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
21 changes: 18 additions & 3 deletions app/views/layouts/_header.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
</div>
</li>

<li class="nav-item dropdown" style="min-width:80px;">
<li class="nav-item dropdown about" style="min-width:80px;">
<div class="nav-link" data-toggle="dropdown" onclick="location.href='#'">
<!-- <a > -->
<%= t('layout._header.about.about_title') %>
Expand All @@ -94,10 +94,10 @@
</div>
</li>

<li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px;">
<li class="nav-item d-md-none d-lg-inline store" style="padding:0 10px;">
<a class="nav-link btn btn-outline-secondary" target="_blank" href="//store.publiclab.org"><%= t('layout._header.store') %></a>
</li>
<li class="nav-item d-sm-none d-lg-inline" style="padding:0 10px;">
<li class="nav-item d-md-none d-lg-inline donate" style="padding:0 10px;">
<a class="nav-link btn btn-outline-secondary" href="/donate"><%= t('layout._header.donate') %></a>
</li>

Expand Down Expand Up @@ -259,7 +259,22 @@
overflow-y: auto;
-webkit-overflow-scrolling:touch;
}
.store{
margin-bottom:5px;
}
}
@media (min-width:768px){
.about{
margin-left:-25px;
}
.store{
width:90px;
}
.donate{
width:90px;
}
}

</style>

<%= render :partial => "map/mapDependencies" %>
2 changes: 1 addition & 1 deletion config/locales/en.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,7 +725,7 @@ en:
spectral_workbench: "Spectral Workbench"
code_community: "Code Community"
about:
about_title: "About us"
about_title: "About Us"
stories: "Stories"
blog: "Blog"
about_public_lab: "About Public Lab"
Expand Down