harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #346 from git-marijus/master

Browse Source 
css fixes
This commit is contained in:
friendica 2014-03-02 12:45:51 +11:00
commit 36e823e5b5
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
view/css/bootstrap-red.css vendored
View File

@ -110,3 +110,9 @@ nav .navbar-collapse {
} }
/* nav overrides end */ /* nav overrides end */
.dropdown-menu img {
width: 32px;
height: 32px;
margin-right: 5px;
}

1
view/css/conversation.css
View File

@ -306,7 +306,6 @@
.like-rotator { .like-rotator {
float: left; float: left;
margin: 8px; margin: 8px;
color: $toolicon_colour;
} }
.wall-item-delete-wrapper { .wall-item-delete-wrapper {

11
view/theme/redbasic/css/style.css
View File

@ -2210,6 +2210,14 @@ nav .dropdown-menu {
border-bottom-left-radius: $radiuspx; border-bottom-left-radius: $radiuspx;
} }
#usermenu-caret {
color: #999;
}
#avatar:hover + #usermenu-caret {
color: #fff;
}
/* bootstrap overrides */ /* bootstrap overrides */
blockquote { blockquote {
font-size: $body_font_size; font-size: $body_font_size;
@ -2221,8 +2229,5 @@ blockquote {
} }
.dropdown-menu img { .dropdown-menu img {
width: 32px;
height: 32px;
margin-right: 5px;
border-radius: $radiuspx; border-radius: $radiuspx;
} }

2
view/tpl/nav.tpl
View File

@ -12,7 +12,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
{{if $userinfo}} {{if $userinfo}}
<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span> <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
{{if $localuser}} {{if $localuser}}
<ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> <ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
{{foreach $nav.usermenu as $usermenu}} {{foreach $nav.usermenu as $usermenu}}