Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitystreams

6 files changed, 26 insertions, 39 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 5fcf901fb..4ae08dec8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -310,6 +310,11 @@ footer {
 	margin-bottom: 0px;
 }
 
+.connect-btn-wrapper {
+	margin-bottom: 10px;
+
+}
+
 .profile-edit-side-link {
 	padding: 3px 0px;
 	opacity: 0;
@@ -475,53 +480,15 @@ footer {
 	float: right;
 }
 
-.rconnect {
-	display: block;
-	color: $nav_active_icon_colour;
-	margin-top: 15px;
-	background-color: $nav_bg;
-	-webkit-border-radius: $radiuspx ;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	border: 1px solid $nav_bd;
-	padding: 5px;
-	font-weight: bold;
-	clear: both;
-}
-
-a.rateme, div.rateme {
-	display: block;
-	color: $nav_active_icon_colour;
-	background-color: $nav_bg;
-	-webkit-border-radius: $radiuspx ;
-	-moz-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	border: 1px solid $nav_bd;
-	padding: 5px;
-	font-weight: bold;
-	clear: both;
-}
-
 #pause {
 	position: fixed;
 	bottom: 5px;
 	right: 5px;
 }
 
-#vcard-end {
-	clear: both;
-}
-
 #contact-block {
 	width: 100%;
 	float: left;
-	background-color: rgba(254,254,254,0.5);
-	border-bottom: 1px solid rgba(238,238,238,0.8);
-	-moz-border-radius: $radiuspx;
-	-webkit-border-radius: $radiuspx;
-	border-radius: $radiuspx;
-	padding: 10px;
-	margin-bottom:10px;
 }
 
 #contact-block-numcontacts {
diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css
index f0ae1e8df..38701024f 100644
--- a/view/theme/redbasic/schema/bluegrid.css
+++ b/view/theme/redbasic/schema/bluegrid.css
@@ -160,6 +160,14 @@ nav .badge:hover, nav .badge:focus {
     color: rgba(255,255,255,.8);
 }
 
+.widget .conv-participants {
+	color: #BBB;
+}
+
+.widget .active:hover .conv-participants, .widget .active:focus .conv-participants {
+	color: inherit;
+}
+
 .help-block, .comment-icon, .jot-icons, .admin-icons {
 	color: inherit;
 }
diff --git a/view/theme/redbasic/schema/dark.css b/view/theme/redbasic/schema/dark.css
index 936f74761..f65e9aac9 100644
--- a/view/theme/redbasic/schema/dark.css
+++ b/view/theme/redbasic/schema/dark.css
@@ -88,7 +88,7 @@
     background-color: #111;
 }
 
-.jotnets-wrapper > a.btn {
+a.btn, aside a {
 	font-weight: 400 !important;
 }
 
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white.css
index f69ba3450..5a6b2655b 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white.css
@@ -75,6 +75,10 @@
     background-color: #fff;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #fff;
     	border-color: #000;
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black.css
index 1f0a2f1e6..d25585f98 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black.css
@@ -75,6 +75,10 @@
     background-color: #000;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #000;
     	border-color: #143D12;
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black.css
index 627f3ee5c..277ac7a12 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black.css
@@ -71,6 +71,10 @@
     background-color: #000;
 }
 
+a.btn, aside a {
+	font-weight: 400 !important;
+}
+
 .btn-default {
     	background-color: #000;
     	border-color: #fff;