aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-27 09:37:29 +1100
committerfriendica <info@friendica.com>2014-02-27 09:37:29 +1100
commit3b24d921b6acc1ca5bcf9b9fceb51a6a12e20268 (patch)
tree0bcf63517630d5d5382ec6a7a8e8769848de6995
parent364fc9f1638e67dad2c289b4d365753a5d06ac05 (diff)
parent8860d80bd4ddfde340fe8004bb4be9f7f7e3fc18 (diff)
downloadvolse-hubzilla-3b24d921b6acc1ca5bcf9b9fceb51a6a12e20268.tar.gz
volse-hubzilla-3b24d921b6acc1ca5bcf9b9fceb51a6a12e20268.tar.bz2
volse-hubzilla-3b24d921b6acc1ca5bcf9b9fceb51a6a12e20268.zip
Merge pull request #341 from git-marijus/master
properly fix profile edit dropdown menu
-rw-r--r--view/theme/redbasic/css/style.css87
-rwxr-xr-xview/tpl/profile_vcard.tpl6
2 files changed, 21 insertions, 72 deletions
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2402e514e..057a0fba4 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -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;
+}
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index 10a928e1c..10a0a25a9 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -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>