Merge https://github.com/friendica/red into pending_merge

1 files changed, 29 insertions, 10 deletions

diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a4373ed37..a8baa4877 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -386,6 +386,7 @@ aside li {
 
 .vcard dl {
 	clear: both;
+	word-wrap:break-word;
 }
 
 .vcard-profile-edit-icon {
@@ -1011,7 +1012,7 @@ aside li {
 .profile-match-name {
 	text-align: center;
 	width: 120px;
-	height: 18px;
+	height: 1.5em;
 	overflow: hidden !important;
 }
 
@@ -1033,7 +1034,7 @@ aside li {
 	float: left;
 	padding: 10px;
 	width: 120px;
-	height: 120px;
+	min-height: 120px;
 	scroll: auto;
 }
 #profile-match-wrapper-end {
@@ -2143,6 +2144,15 @@ nav .dropdown-menu>li>a:hover,nav .dropdown-menu>li>a:focus{
 	color: $nav_active_icon_colour;
 }
 
+/* Files */
+
+#attach-edit-perms {
+	margin-top: 25px;
+	margin-bottom: 20px;
+	font-weight: bold;
+	font-size: 17px;
+}
+
 /* bootstrap overrides */
 blockquote {
 	font-size: $body_font_size;
@@ -2243,33 +2253,42 @@ blockquote {
 }
 
 .nav-tabs{
-	border-bottom:1px solid $navtabs_borderc !important;
+	border-bottom:1px solid $navtabs_borderc;
 }
 
 .nav-tabs>li.active>a,.nav-tabs>li.active>a:hover,.nav-tabs>li.active>a:focus{
-	color: $navtabs_fontcolour !important; 
+	color: $navtabs_fontcolour;
 	background-color: $navtabs_bgcolour; 
 }
 
 .nav-tabs.nav-justified>.active>a,.nav-tabs.nav-justified>.active>a:hover,.nav-tabs.nav-justified>.active>a:focus{
-	border:1px solid $navtabs_borderc !important;
-	border-bottom:1px solid transparent !important;
-	bottom: -1px !important;
+	border:1px solid $navtabs_borderc;
+	border-bottom:1px solid transparent;
 }
 
 .nav-tabs.nav-justified > li > a {
-    	border-bottom: none;
 	$navtabs_linkcolour
 }
 
 .nav-tabs > li > a:hover, .nav-tabs > li > a:focus {
     	text-decoration: $navtabs_decohover;
     	background-color: $navtabs_bgchover;
-   	border-bottom: 1px solid $navtabs_bgchover;
-	border-color: $navtabs_bgchover;
+	border-color: transparent;
+	border-bottom-color: $navtabs_borderc;
 	$navtabs_linkchover
 }
 
+@media (min-width: 768px) {
+  .nav-tabs.nav-justified > li > a {
+    border-bottom: 1px solid $navtabs_borderc;
+  }
+  .nav-tabs.nav-justified > .active > a,
+  .nav-tabs.nav-justified > .active > a:hover,
+  .nav-tabs.nav-justified > .active > a:focus {
+    border-bottom-color: transparent;
+  }
+}
+
 .btn-default {
     	background-color: $editbuttons_bgcolour;
     	border-color: $editbuttons_bordercolour;