Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Comptoir
Comptoir-srv
Commits
2d164855
Commit
2d164855
authored
Jan 30, 2020
by
Fabrice Gangler
🎨
Browse files
FIX: update menu --> CSS bug: links are not usable sometimes
Refs:
#650
parent
21fcff35
Pipeline
#7959
passed with stage
in 2 minutes and 15 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/Template/Element/Navigation/navbarFixedTop.ctp
View file @
2d164855
...
...
@@ -35,7 +35,7 @@
<?php // ===== main navigation bar ============================================================== ?>
<ul class="nav navbar-nav navbar-left nav-pull-down">
<ul class="nav navbar-nav navbar-left nav-pull-down"
id="navbar-mainMenu"
>
<?php if ($this->isHere("Softwares")): ?>
<li class="current">
<span class=" text-center"><?= __d("ElementNavigation", "All softwares") ?></span>
...
...
@@ -84,27 +84,28 @@
<?php // ===== auth + search ================================================================= ?>
<?php if (!$this->request->session()->read('Auth.User.username')) : ?>
<ul class = " nav navbar-nav navbar-right nav-pull-down-right">
<li class="mainSearchElement">
<?= $this->element("Pages/SearchForm") ?>
</li>
<li>
<?= $this->Html->link(__d("Layout", "Sign up"),
["prefix"=>false,'controller' => 'Users', 'action' => 'add'],
[
// 'class'=>"btn btn-default",
'escape' => false]) ?>
</li>
<li class="clean-nav">
<?= $this->Html->link(__d("Layout", "Sign in"),
["prefix"=>false,'controller' => 'Users', 'action' => 'login'],
[
// 'class'=>"btn btn-default",
'escape' => false]) ?>
</li>
<?php elseif ($this->request->session()->read('Auth.User.username')) : ?>
<ul class = "nav navbar-nav navbar-right nav-pull-down-right">
<ul class = " nav navbar-nav navbar-right nav-pull-down-right">
<li class="mainSearchElement">
<?= $this->element("Pages/SearchForm") ?>
</li>
<li>
<?= $this->Html->link(__d("Layout", "Sign up"),
["prefix"=>false,'controller' => 'Users', 'action' => 'add'],
[
// 'class'=>"btn btn-default",
'escape' => false]) ?>
</li>
<li class="clean-nav">
<?= $this->Html->link(__d("Layout", "Sign in"),
["prefix"=>false,'controller' => 'Users', 'action' => 'login'],
[
// 'class'=>"btn btn-default",
'escape' => false]) ?>
</li>
</ul>
<?php elseif ($this->request->session()->read('Auth.User.username')) : ?>
<ul class = "nav navbar-nav navbar-right nav-pull-down-right">
<li class="mainSearchElement">
<?= $this->element("Pages/SearchForm") ?>
</li>
<li class="clean-nav">
...
...
@@ -127,9 +128,8 @@
</li>
</ul>
</li>
<?php endif; ?>
</ul>
<?php endif; ?>
</nav>
</div>
</div>
...
...
webroot/css/comptoir.css
View file @
2d164855
...
...
@@ -80,12 +80,21 @@ body {
margin-bottom
:
2em
;
}
#navbar-mainMenu
{
z-index
:
1
;
}
/* ---------------------------------------------------------------------------------------------------------------------
* Nav: min-width 768px
*/
@media
(
min-width
:
768px
)
{
#navbar-mainMenu
a
:hover
,
#navbar-mainMenu
a
:focus
{
background-color
:
transparent
;
}
.nav
,
.nav
ul
{
margin
:
0
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment