mirror of
https://github.com/friendica/friendica
synced 2024-11-10 07:42:53 +00:00
Merge pull request #8259 from MrPetovan/bug/8248-frio-fix-notification-dropdown
[frio] Fix notification dropdown
This commit is contained in:
Philipp
GitHub
commit
8253d902a7
2 changed files with 37 additions and 39 deletions
|
|
@ -410,14 +410,20 @@ header #banner #logo-img,
|
|||
float: left
|
||||
}
|
||||
@media (min-width: 992px) {
|
||||
.topbar ul.nav>li>a {
|
||||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
line-height: 20px
|
||||
}
|
||||
.topbar ul.nav > li > a,
|
||||
.topbar ul.nav > li > button
|
||||
{
|
||||
padding-top: 15px;
|
||||
padding-bottom: 15px;
|
||||
line-height: 20px
|
||||
}
|
||||
}
|
||||
@media (max-width: 991px) {
|
||||
.topbar ul.nav>li>a { padding-left: 10px; padding-right: 10px; };
|
||||
.topbar ul.nav > li > a,
|
||||
.topbar ul.nav > li > button
|
||||
{
|
||||
padding: 15px 10px;
|
||||
}
|
||||
}
|
||||
.topbar .dropdown-footer {
|
||||
margin: 10px
|
||||
|
|
@ -451,13 +457,24 @@ nav.navbar {
|
|||
z-index: 1030;
|
||||
color: $nav_icon_color;
|
||||
}
|
||||
#topbar-first .nav>li>a:hover,
|
||||
#topbar-first .nav>li>a:focus,
|
||||
#topbar-first .nav>.open>a,
|
||||
#dropdownMenu1:hover,
|
||||
#dropdownMenu1:focus,
|
||||
nav.navbar .nav>li>a:hover,
|
||||
nav.navbar .nav>li>a:focus{
|
||||
#topbar-first .nav > li > a,
|
||||
#topbar-first .nav > li > button,
|
||||
nav.navbar .nav > li > a,
|
||||
nav.navbar .nav > li > button
|
||||
{
|
||||
color: $nav_icon_color;
|
||||
}
|
||||
#topbar-first .nav > li > a:hover,
|
||||
#topbar-first .nav > li > a:focus,
|
||||
#topbar-first .nav > li > button:hover,
|
||||
#topbar-first .nav > li > button:focus,
|
||||
#topbar-first .nav > .open > a,
|
||||
#topbar-first .nav > .open > button,
|
||||
nav.navbar .nav > li > a:hover,
|
||||
nav.navbar .nav > li > a:focus
|
||||
nav.navbar .nav > li > button:hover,
|
||||
nav.navbar .nav > li > button:focus
|
||||
{
|
||||
background-color: $nav_icon_hover_color;
|
||||
}
|
||||
#topbar-first .nav>.account {
|
||||
|
|
@ -487,7 +504,6 @@ nav.navbar .nav>li>a:focus{
|
|||
z-index: 3
|
||||
}
|
||||
#topbar-first .topbar-nav {
|
||||
/*position: absolute;*/
|
||||
left: 0;
|
||||
right: 0;
|
||||
text-align: center;
|
||||
|
|
@ -497,13 +513,11 @@ nav.navbar .nav>li>a:focus{
|
|||
position: relative;
|
||||
text-align: left
|
||||
}
|
||||
#topbar-first .topbar-nav .nav-segment>a {
|
||||
/* padding: 5px 10px;
|
||||
margin: 10px 2px;*/
|
||||
#topbar-first .topbar-nav .nav-segment > a
|
||||
{
|
||||
display: inline-block;
|
||||
/* border-radius: 2px;*/
|
||||
text-decoration: none;
|
||||
text-align: left
|
||||
text-align: left;
|
||||
}
|
||||
#topbar-first .topbar-nav .nav-segment .nav-notification {
|
||||
position: absolute;
|
||||
|
|
@ -590,10 +604,6 @@ nav.navbar .nav>li>a:focus{
|
|||
#topbar-first .dropdown-footer {
|
||||
margin: 10px 10px 5px
|
||||
}
|
||||
#topbar-first a, #topbar-first .btn-link,
|
||||
nav.navbar a, nav.navbar .btn-link {
|
||||
color: $nav_icon_color;
|
||||
}
|
||||
#topbar-first .caret {
|
||||
border-top-color: #bebebe
|
||||
}
|
||||
|
|
@ -862,22 +872,12 @@ nav.navbar a, nav.navbar .btn-link {
|
|||
}
|
||||
|
||||
/* Dropdown Menus */
|
||||
#dropdownMenu1 {
|
||||
padding: 15px 15px;
|
||||
}
|
||||
.nav > li > .btn-link {
|
||||
position: relative;
|
||||
display: block;
|
||||
padding: 10px 15px;
|
||||
}
|
||||
.nav > li > .btn-link:focus,
|
||||
.nav > li > .btn-link:hover {
|
||||
text-decoration: none;
|
||||
background-color: #eee;
|
||||
}
|
||||
.nav .open > .btn-link,
|
||||
.nav .open > .btn-link:focus,
|
||||
.nav .open > .btn-link:hover {
|
||||
.nav .open > .btn-link {
|
||||
background-color: #eee;
|
||||
border-color: #337ab7;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@
|
|||
</button>
|
||||
|
||||
{{* Left section of the NavBar with navigation shortcuts/icons *}}
|
||||
<ul class="nav navbar-nav navbar-left" role="menubar">
|
||||
<ul class="nav navbar-left" role="menubar">
|
||||
{{if $nav.network}}
|
||||
<li class="nav-segment">
|
||||
<a accesskey="n" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notification"></span></a>
|
||||
|
|
@ -76,14 +76,12 @@
|
|||
{{* The notifications dropdown *}}
|
||||
{{if $nav.notifications}}
|
||||
<li id="nav-notification" class="nav-segment dropdown" role="presentation">
|
||||
<button id="dropdownMenu1" class="btn-link dropdown-toggle" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
|
||||
<button id="nav-notifications-menu-btn" class="btn-link dropdown-toggle" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-notifications-menu">
|
||||
<span id="notification-update" class="nav-notification-badge badge nav-notification dropdown" data-toggle="dropdown"></span>
|
||||
<i class="fa fa-bell fa-lg" aria-label="{{$nav.notifications.1}}"></i>
|
||||
</button>
|
||||
{{* The notifications dropdown menu. There are two parts of menu. The second is at the bottom of this file. It is loaded via js. Look at nav-notifications-template *}}
|
||||
<ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="dropdownMenu1">
|
||||
<!-- <ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="dropdownMenu1" style="display: none;">
|
||||
-->
|
||||
<ul id="nav-notifications-menu" class="dropdown-menu menu-popup" role="menu" aria-labelledby="nav-notifications-menu-btn">
|
||||
{{* the following list entry must have the id "nav-notificaionts-mark-all". Without it this isn't visable. ....strange behavior :-/ *}}
|
||||
<li role="presentation" id="nav-notifications-mark-all" class="dropdown-header">
|
||||
<div class="arrow"></div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue