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

17 files changed, 47 insertions, 22 deletions

diff --git a/view/css/conversation.css b/view/css/conversation.css
index c239a665b..cff59aecb 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -15,11 +15,11 @@
 #jot-title-wrap,
 #jot-pagetitle-wrap,
 #jot-category-wrap {
-	border-bottom: 1px solid #ccc;
+	border-bottom: 1px solid rgba(0, 0, 0, .2);
 }
 
 #jot-attachment-wrap {
-	border-top: 1px solid #ccc;
+	border-top: 1px solid rgba(0, 0, 0, .2);
 }
 
 #jot-title-wrap input,
@@ -65,7 +65,7 @@
 }
 
 #profile-jot-submit-wrapper {
-	border-top: 1px solid #ccc;
+	border-top: 1px solid rgba(0, 0, 0, .2);
 }
 
 /* conversation */
@@ -87,6 +87,23 @@
 	margin-left:10px;
 }
 
+.wall-item-photo-wrapper {
+	position: relative;
+}
+
+.wall-item-photo-caret {
+	position: absolute;
+	left: 3px;
+	bottom: 0px;
+	color: #fff;
+	text-shadow: 1px 1px 3px rgba(0, 0, 0, .5);
+	display: none;
+}
+
+.wall-item-photo-wrapper:hover .wall-item-photo-caret {
+	display: block;
+}
+
 .wall-item-divider {
 	margin: 5px;
 }
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 48df1811f..9730d6915 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -41,6 +41,7 @@ li:hover .widget-nav-pills-icons {
 /* notes */ 
 
 #note-text {
+	border: 1px solid rgba(0,0,0,.125);
 	padding: 5px;
 	width: 100%;
 	resize: none;
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 6e516b21e..0bb523457 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1051,12 +1051,14 @@ img.mail-conv-sender-photo {
 }
 
 #profile-jot-wrapper {
-	background-color: rgba(254,254,254,1);
-	border: 1px solid #ccc;
+	background-color: rgba(254, 254, 254, 1);
+	border: 1px solid rgba(0, 0, 0, .2);
 	border-radius: $radius;
 
 }
 
+#jot-title,
+#jot-pagetitle,
 #profile-jot-text {
 	border-radius: $radius;
 }
@@ -1208,7 +1210,6 @@ img.mail-conv-sender-photo {
 }
 
 #note-text {
-	border: 1px solid #ccc;
 	border-radius: $radius;
 }
 
@@ -1303,8 +1304,7 @@ img.mail-conv-sender-photo {
 }
 
 .generic-content-wrapper {
-	border: 1px solid #ccc;
-	box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.2);
+	border: 1px solid rgba(0, 0, 0, .2);
 	border-radius: $radius;
 	margin-bottom: 1.5rem;
 }
diff --git a/view/theme/redbasic/schema/BS-Default.css b/view/theme/redbasic/schema/BS-Default.css
deleted file mode 100644
index 9045d3b97..000000000
--- a/view/theme/redbasic/schema/BS-Default.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.navbar-dark .navbar-toggler {
-	color: rgba(0,0,0,0.7);
-}
-
-#notifications-btn.text-white {
-	color: #777 !important;
-}
diff --git a/view/theme/redbasic/schema/Focus-Boxy.css b/view/theme/redbasic/schema/Focus-Boxy.css
new file mode 100644
index 000000000..b9b259796
--- /dev/null
+++ b/view/theme/redbasic/schema/Focus-Boxy.css
@@ -0,0 +1,15 @@
+.comment .wall-item-body {
+	padding-left: 42px;
+}
+
+.wall-item-content-wrapper.comment {
+	border-bottom: 1px solid #dee2e6;
+}
+
+.widget {
+	border: 1px solid #dee2e6;
+}
+
+#note-text {
+	border: 1px solid transparent;
+}
diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/Focus-Boxy.php
index f298a0def..f298a0def 100644
--- a/view/theme/redbasic/schema/boxy.php
+++ b/view/theme/redbasic/schema/Focus-Boxy.php
diff --git a/view/theme/redbasic/schema/Focus-Light.css b/view/theme/redbasic/schema/Focus-Light.css
new file mode 100644
index 000000000..d23fc0fd8
--- /dev/null
+++ b/view/theme/redbasic/schema/Focus-Light.css
@@ -0,0 +1,4 @@
+.navbar-dark .navbar-toggler,
+.navbar-dark .nav-link.active {
+	color: rgba(0,0,0,0.7) !important;
+}
diff --git a/view/theme/redbasic/schema/BS-Default.php b/view/theme/redbasic/schema/Focus-Light.php
index 14ee130d9..14ee130d9 100644
--- a/view/theme/redbasic/schema/BS-Default.php
+++ b/view/theme/redbasic/schema/Focus-Light.php
diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css
deleted file mode 100644
index 43ef3e34e..000000000
--- a/view/theme/redbasic/schema/boxy.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.comment .wall-item-body {
-	padding-left: 42px;
-}
-
-.wall-item-content-wrapper.comment {
-	border-bottom: 1px solid #ccc;
-}
diff --git a/view/theme/redbasic/schema/simple_black_on_white.css b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).css
index ab819d774..ab819d774 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.css
+++ b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).css
diff --git a/view/theme/redbasic/schema/simple_black_on_white.php b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php
index 554e832f0..554e832f0 100644
--- a/view/theme/redbasic/schema/simple_black_on_white.php
+++ b/view/theme/redbasic/schema/simple_black_on_white_(unmaintained,deprecated).php
diff --git a/view/theme/redbasic/schema/simple_green_on_black.css b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).css
index c8ea87050..c8ea87050 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.css
+++ b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).css
diff --git a/view/theme/redbasic/schema/simple_green_on_black.php b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php
index 8192180db..8192180db 100644
--- a/view/theme/redbasic/schema/simple_green_on_black.php
+++ b/view/theme/redbasic/schema/simple_green_on_black_(unmaintained,deprecated).php
diff --git a/view/theme/redbasic/schema/simple_white_on_black.css b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).css
index ea04d4d9e..ea04d4d9e 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.css
+++ b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).css
diff --git a/view/theme/redbasic/schema/simple_white_on_black.php b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php
index b64f60bbe..b64f60bbe 100644
--- a/view/theme/redbasic/schema/simple_white_on_black.php
+++ b/view/theme/redbasic/schema/simple_white_on_black_(unmaintained,deprecated).php
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index a1d287f26..a408a83d2 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -31,6 +31,7 @@
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
 							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}"  data-toggle="dropdown" />
 							{{if $item.thread_author_menu}}
+							<i class="fa fa-caret-down wall-item-photo-caret"></i>
 							<div class="dropdown-menu">
 								{{foreach $item.thread_author_menu as $mitem}}
 								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index c42751057..f94a2f24f 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -31,6 +31,7 @@
 						<div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} h-card p-author" id="wall-item-photo-wrapper-{{$item.id}}">
 							<img src="{{$item.thumb}}" class="fakelink wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" data-toggle="dropdown" /></a>
 							{{if $item.thread_author_menu}}
+							<i class="fa fa-caret-down wall-item-photo-caret"></i>
 							<div class="dropdown-menu">
 								{{foreach $item.thread_author_menu as $mitem}}
 								<a class="dropdown-item" {{if $mitem.href}}href="{{$mitem.href}}"{{/if}} {{if $mitem.action}}onclick="{{$mitem.action}}"{{/if}} {{if $mitem.title}}title="{{$mitem.title}}"{{/if}} >{{$mitem.title}}</a>