From b390336016cb7b0d60251efd719bbecf635c1945 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 28 Feb 2014 23:04:38 +0100
Subject: add hover effect to usermenu caret

---
 view/css/bootstrap-red.css        |  6 ++++++
 view/css/conversation.css         |  1 -
 view/theme/redbasic/css/style.css | 11 ++++++++---
 view/tpl/nav.tpl                  |  2 +-
 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}}
-- 
cgit v1.2.3


From e82c9eb176541b42c9ea00828d4d1a7f1231743b Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 28 Feb 2014 23:23:19 +0100
Subject: a little fix against bootstrap 3.1.1

---
 view/css/bootstrap-red.css        | 4 ++++
 view/theme/redbasic/css/style.css | 1 +
 2 files changed, 5 insertions(+)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 606e47838..24550057a 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -116,3 +116,7 @@ nav .navbar-collapse {
 	height: 32px;
 	margin-right: 5px;
 }
+
+.container-fluid {
+    padding-left: 0px;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index c410c61bc..5a5d60d00 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2191,6 +2191,7 @@ nav img {
 	height: 47px;
 	width: 47px;
 	margin-top: 2px;
+	margin-left: 15px;
 	border-radius: $radiuspx;
 }
 
-- 
cgit v1.2.3


From 6b6052d5a9dcbbd9f1edeb829008ccc0ac1efb3b Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 28 Feb 2014 23:34:52 +0100
Subject: Revert "a little fix against bootstrap 3.1.1"

This reverts commit e82c9eb176541b42c9ea00828d4d1a7f1231743b.
---
 view/css/bootstrap-red.css        | 4 ----
 view/theme/redbasic/css/style.css | 1 -
 2 files changed, 5 deletions(-)

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index 24550057a..606e47838 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -116,7 +116,3 @@ nav .navbar-collapse {
 	height: 32px;
 	margin-right: 5px;
 }
-
-.container-fluid {
-    padding-left: 0px;
-}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5a5d60d00..c410c61bc 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2191,7 +2191,6 @@ nav img {
 	height: 47px;
 	width: 47px;
 	margin-top: 2px;
-	margin-left: 15px;
 	border-radius: $radiuspx;
 }
 
-- 
cgit v1.2.3