diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 3 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 65 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 4 |
3 files changed, 66 insertions, 6 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index b180bea61..45cf76fb6 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -109,7 +109,4 @@ nav .navbar-collapse { max-height: 450px; } -nav .navbar-right li:last-child { - padding-right: 20px; -} /* nav overrides end */ diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5a8470a60..2402e514e 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -494,6 +494,64 @@ footer { 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, @@ -2191,7 +2249,7 @@ nav i { nav img { height: 47px; width: 47px; - margin: 2px 0px 1px 10px; + margin-top: 2px; border-radius: $radiuspx; } @@ -2210,3 +2268,8 @@ nav .dropdown-menu { border-bottom-right-radius: $radiuspx; border-bottom-left-radius: $radiuspx; } + +/* bootstrap overrides */ +blockquote { + font-size: $body_font_size; +} diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 187c3039d..10a928e1c 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -2,8 +2,8 @@ {{if $profile.edit}} <div class="action"> - <a class="profile-edit-side-link" 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"> + <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"> {{foreach $profile.menu.entries as $e}} <li> <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a> |