Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

1 files changed, 19 insertions, 107 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index bde17ea49..692baa263 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -78,6 +78,8 @@ h6, .h6 {
 }
 
 #banner {
+	color: $banner_colour;
+	font-weight: bold;
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
@@ -97,10 +99,6 @@ abbr {
 }
 
 /* icons */
-.tool-icons,
-.cat-icons {
-	color: $toolicon_colour;
-}
 
 a,
 .fakelink {
@@ -283,8 +281,6 @@ footer {
 	padding: 0px 10px 10px 10px;
 	background-color: rgba(254,254,254,0.5);
 	border: 1px solid rgba(254,254,254,0.5);
-	-moz-border-radius: $radius;
-	-webkit-border-radius: $radius;
 	border-radius: $radius;
 	word-wrap: break-word;
 }
@@ -378,7 +374,6 @@ footer {
 .photo,
 .contact-block-img {
 	border-radius: $radius;
-	-moz-border-radius: $radius;
 	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
@@ -393,7 +388,6 @@ footer {
 .profile-match-photo img,
 .directory-photo-img {
 	border-radius: $radius;
-	-moz-border-radius: $radius;
 	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
@@ -739,18 +733,6 @@ div.jGrowl div.jGrowl-notification {
 	text-align: center;
 }
 
-a.rconnect, a.rateme, div.rateme {
-  color: $nav_active_icon_colour;
-  text-decoration: none;
-  font-weight: normal;
-  outline: none;
-}
-
-a.rconnect:hover, a.rateme:hover, div.rateme:hover {
-	color: #0080FF;
-	text-decoration: none;
-}
-
 .conv-participants {
 	color: $font_colour;
 }
@@ -902,19 +884,14 @@ margin-right: 50px;
 
 .generic-icons {
 	font-size: 1rem;
-	color: $toolicon_colour;
 	margin-right: 0.5rem;
 }
 
 .generic-icons-right {
 	font-size: 1rem;
-	color: $toolicon_colour;
 	margin-left: 0.5rem;
 }
 
-.generic-icons:hover {
-	color: $toolicon_colour;
-}
 
 .generic-icons-nav {
 	font-size: 1.2em;
@@ -923,13 +900,11 @@ margin-right: 50px;
 
 .admin-icons {
 	font-size: 1.2em;
-	color: $toolicon_colour;
 	margin-right: 7px;
 }
 
 .drop-icons,
 a .drop-icons {
-	color: $toolicon_colour;
 	font-size: 1.2em;
 	text-decoration: none;
 	cursor: pointer;
@@ -975,7 +950,6 @@ th,td {
 /* mail */
 
 img.mail-conv-sender-photo {
-	-moz-border-radius: $radius;
 	border-radius: $radius;
 }
 
@@ -1099,23 +1073,21 @@ img.mail-conv-sender-photo {
 	border-top: 0px solid $comment_item_colour;
 }
 
+
 .wall-item-photo {
+	width: $top_photo;
+	height: $top_photo;
 	border: none;
-	width: $top_photo !important;
-	height: $top_photo !important;
-
+	border-radius: $radius;
+	box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
 }
 
 .comment .wall-item-photo {
-	width: $reply_photo !important;
-	height: $reply_photo !important;
+	width: $reply_photo;
+	height: $reply_photo;
 }
 
-.wall-item-photo {
-    border-radius: $radius;
-    -moz-border-radius: $radius;
-    box-shadow: $shadowpx $shadowpx $shadowpx 0 #444444;
-}
+
 
 .wall-item-ago,
 a:hover .wall-item-ago,
@@ -1139,14 +1111,6 @@ a:active .dropdown-sub-text {
 	font-size: 1rem;
 }
 
-.item-tool {
-	font-size: 1.2em;
-	color: $toolicon_colour;
-}
-
-.like-rotator {
-	color: $toolicon_colour;
-}
 
 .comment-edit-text-empty,
 .comment-edit-text-full {
@@ -1177,19 +1141,12 @@ a:active .dropdown-sub-text {
 .widget {
 	background-color: rgba(254,254,254,.5);
 	border: 1px solid rgba(254,254,254,.5);
-	-moz-border-radius: $radius;
-	-webkit-border-radius: $radius;
 	border-radius: $radius;
 }
 
-.widget h3 {
-	color: $toolicon_colour;
-}
-
 #note-text {
 	border: 1px solid #ccc;
 	border-radius: $radius;
-	-moz-border-radius: $radius;
 }
 
 .fileas-ul {
@@ -1199,7 +1156,6 @@ a:active .dropdown-sub-text {
 #datebrowse-sidebar select {
 	border: 1px solid #ccc;
 	border-radius: $radius;
-	-moz-border-radius: $radius;
 }
 
 .thing-show img {
@@ -1439,62 +1395,22 @@ blockquote {
 	border-radius: $radius;
 }
 
-/*
-.navbar-inverse {
-	background-image: -webkit-linear-gradient(top, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
-	background-image:         linear-gradient(to bottom, $nav_gradient_top 0%, $nav_gradient_bottom 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_gradient_top, endColorstr=$nav_gradient_bottom, GradientType=0);
-	background-color: $nav_bg;
-	border-color: $nav_bd;
-}
-
-
-.navbar-inverse .navbar-collapse {
-	border-color: $nav_bd;
-}
-
-.navbar-inverse .navbar-nav > .active > a {
-	background-image: -webkit-linear-gradient(top, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
-	background-image:         linear-gradient(to bottom, $nav_active_gradient_top 0%, $nav_active_gradient_bottom 100%);
-	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=$nav_active_gradient_top, endColorstr=$nav_active_gradient_bottom, GradientType=0);
+.bg-inverse {
+	background-color: $nav_bg !important;
 }
 
-
-.navbar-inverse .navbar-nav > li > a {
+.navbar-inverse .navbar-nav .nav-link,
+.usermenu i {
 	color: $nav_icon_colour;
 }
 
-.navbar-inverse .navbar-nav > li > a:hover,
-.navbar-inverse .navbar-nav > li > a:focus {
-	color: $nav_active_icon_colour;
-}
-
-.navbar-inverse .navbar-nav > .active > a,
-.navbar-inverse .navbar-nav > .active > a:hover,
-.navbar-inverse .navbar-nav > .active > a:focus {
-	color: $nav_active_icon_colour;
-}
-
-.navbar-inverse .navbar-nav > .open > a,
-.navbar-inverse .navbar-nav > .open > a:hover,
-.navbar-inverse .navbar-nav > .open > a:focus {
-	background-color: $nav_bd;
+.navbar-inverse .navbar-nav .nav-link:focus,
+.navbar-inverse .navbar-nav .nav-link:hover,
+.usermenu:focus i,
+.usermenu:hover i {
 	color: $nav_active_icon_colour;
 }
 
-.navbar-inverse .navbar-toggle {
-	border-color: $nav_bd;
-}
-.navbar-inverse .navbar-toggle:hover,
-.navbar-inverse .navbar-toggle:focus {
-	background-color: $nav_bg;
-}
-
-.navbar-inverse .navbar-toggle .icon-bar {
-	background-color: $nav_active_icon_colour;
-}
-*/
-
 @media screen and (max-width: 767px) {
 
 	aside#region_1 {
@@ -1693,13 +1609,9 @@ dl.bb-dl > dd > li {
 	border-left: 0.2rem solid #eee;
 }
 
-.w100 {
-	width: 100%;
-}
-
 .app-icon {
+	color: #777;
 	font-size: 80px;
-	color: $toolicon_colour;
 	text-shadow: 3px 3px 3px lightgrey;
 }