mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 08:15:13 +00:00
Merge https://github.com/friendica/red into zpull
This commit is contained in:
commit
efb77774b5
2 changed files with 21 additions and 72 deletions
|
@ -429,6 +429,11 @@ footer {
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
.vcard .dropdown-menu {
|
||||
position: absolute;
|
||||
left: 200px;
|
||||
top: 18px;
|
||||
}
|
||||
|
||||
#profile-extra-links {
|
||||
clear: both;
|
||||
|
@ -445,9 +450,7 @@ footer {
|
|||
margin-top: 5px;
|
||||
}
|
||||
|
||||
.profile-edit-side-div {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.profile-edit-side-link {
|
||||
opacity: 0.3;
|
||||
filter:alpha(opacity=30);
|
||||
|
@ -488,72 +491,6 @@ footer {
|
|||
padding: 12px;
|
||||
}
|
||||
|
||||
#profiles-menu.menu-popup {
|
||||
left: 200px;
|
||||
right: auto;
|
||||
top: 22px;
|
||||
}
|
||||
|
||||
ul.menu-popup {
|
||||
position: absolute;
|
||||
display: none;
|
||||
width: 10em;
|
||||
background: #0080FF;
|
||||
color: #eec;
|
||||
padding: 0px;
|
||||
list-style: none;
|
||||
/* border-radius: 0px 0px 20px 20px; */
|
||||
z-index: 100000;
|
||||
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
|
||||
}
|
||||
ul.menu-popup a {
|
||||
display: block;
|
||||
color: #FFFFFF;
|
||||
padding: 5px 10px;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
|
||||
ul.menu-popup a:hover {
|
||||
background-color: #888888;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
ul.menu-popup .menu-sep {
|
||||
border-top: 1px solid #9eabb0;
|
||||
}
|
||||
ul.menu-popup li {
|
||||
float: none;
|
||||
overflow: auto;
|
||||
height: auto;
|
||||
display: block;
|
||||
}
|
||||
ul.menu-popup li img {
|
||||
float: left;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
padding-right: 5px;
|
||||
}
|
||||
ul.menu-popup .empty {
|
||||
padding: 5px;
|
||||
text-align: center;
|
||||
color: #9eabb0;
|
||||
}
|
||||
ul.menu-popup .toolbar {
|
||||
background-color: #9eabb0;
|
||||
height: auto;
|
||||
overflow: auto;
|
||||
}
|
||||
ul.menu-popup .toolbar a {
|
||||
float: right;
|
||||
}
|
||||
ul.menu-popup .toolbar a:hover {
|
||||
background-color: #ffffff;
|
||||
}
|
||||
|
||||
|
||||
|
||||
#profile-in-dir-yes-label,
|
||||
#profile-in-dir-no-label,
|
||||
#profile-in-netdir-yes-label,
|
||||
|
@ -2273,3 +2210,15 @@ nav .dropdown-menu {
|
|||
blockquote {
|
||||
font-size: $body_font_size;
|
||||
}
|
||||
|
||||
.dropdown-menu {
|
||||
font-size: $body_font_size;
|
||||
border-radius: $radiuspx;
|
||||
}
|
||||
|
||||
.dropdown-menu img {
|
||||
width: 32px;
|
||||
height: 32px;
|
||||
margin-right: 5px;
|
||||
border-radius: $radiuspx;
|
||||
}
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
<div class="vcard">
|
||||
|
||||
{{if $profile.edit}}
|
||||
<div class="action">
|
||||
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" rel="#profiles-menu" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil vcard-profile-edit-icon" title="{{$profile.edit.1}}" ></i></a>
|
||||
<ul id="profiles-menu" class="menu-popup dropdown-menu">
|
||||
<div class="dropdown">
|
||||
<a class="profile-edit-side-link dropdown-toggle" data-toggle="dropdown" title="{{$profile.edit.3}}" href="#" ><i class="icon-pencil" title="{{$profile.edit.1}}" ></i></a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
{{foreach $profile.menu.entries as $e}}
|
||||
<li>
|
||||
<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
|
||||
|
|
Loading…
Reference in a new issue