aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-02 12:45:51 +1100
committerfriendica <info@friendica.com>2014-03-02 12:45:51 +1100
commit36e823e5b5fe170eed05520b3dbf4d9328ab59f9 (patch)
treec3d37c43fa535de7c14e7eb47766084cc379dcdc
parentc402f39cf869329835fb24dac5613629278a2713 (diff)
parent6b6052d5a9dcbbd9f1edeb829008ccc0ac1efb3b (diff)
downloadvolse-hubzilla-36e823e5b5fe170eed05520b3dbf4d9328ab59f9.tar.gz
volse-hubzilla-36e823e5b5fe170eed05520b3dbf4d9328ab59f9.tar.bz2
volse-hubzilla-36e823e5b5fe170eed05520b3dbf4d9328ab59f9.zip
Merge pull request #346 from git-marijus/master
css fixes
-rw-r--r--view/css/bootstrap-red.css6
-rw-r--r--view/css/conversation.css1
-rw-r--r--view/theme/redbasic/css/style.css11
-rwxr-xr-xview/tpl/nav.tpl2
4 files changed, 15 insertions, 5 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 45cf76fb6..606e47838 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -110,3 +110,9 @@ nav .navbar-collapse {
}
/* nav overrides end */
+
+.dropdown-menu img {
+ width: 32px;
+ height: 32px;
+ margin-right: 5px;
+}
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 3396863e7..325303559 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -306,7 +306,6 @@
.like-rotator {
float: left;
margin: 8px;
- color: $toolicon_colour;
}
.wall-item-delete-wrapper {
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2efe79dcc..c410c61bc 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2210,6 +2210,14 @@ nav .dropdown-menu {
border-bottom-left-radius: $radiuspx;
}
+#usermenu-caret {
+ color: #999;
+}
+
+#avatar:hover + #usermenu-caret {
+ color: #fff;
+}
+
/* bootstrap overrides */
blockquote {
font-size: $body_font_size;
@@ -2221,8 +2229,5 @@ blockquote {
}
.dropdown-menu img {
- width: 32px;
- height: 32px;
- margin-right: 5px;
border-radius: $radiuspx;
}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 20600ccd7..7d2ce1b7a 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -12,7 +12,7 @@
<span class="icon-bar"></span>
</button>
{{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}}
<ul class="dropdown-menu" role="menu" aria-labelledby="avatar">
{{foreach $nav.usermenu as $usermenu}}