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

10 files changed, 76 insertions, 198 deletions

diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css
index f1ebb204e..d4f5b2d9b 100644
--- a/view/css/bootstrap-red.css
+++ b/view/css/bootstrap-red.css
@@ -4,60 +4,59 @@
 
 nav .badge {
 	position: absolute;
-	top: 1px;
-	left: 1px;
-	font-size: 10px;
-	line-height: 20px;
-	padding: 0px 5px;
-	height: 20px;
-	min-width: 20px;
-	border-radius: 10px;
+	font-size: 0.75rem;
 }
 
-#navbar-collapse-1 i,
-.navbar-header i {
-	font-size: 14px;
+@media screen and (min-width: 767px) {
+	nav .badge {
+		top: -0.25rem;
+		left: -0.25rem;
+	}
 }
 
-nav .navbar-header img {
-	height: 49px;
-	width: 49px;
-	margin-top: 1px;
+@media screen and (max-width: 767px) {
+	nav .badge {
+		top: 0.5rem;
+		left: 1.5rem;
+	}
 }
 
-/* nav overrides end */
+.widget .badge {
+	font-size: 100%;
+}
 
+.nav-item.nav-item-hack {
+	height: 2.3rem;
+}
 
-aside .nav-pills > li > a,
-.response-list .nav-pills > li > a {
-	padding: 6px 10px;
+#navbar-collapse-1 i {
+	font-size: 1rem;
 }
 
 nav .dropdown-menu {
-	margin-top: 0px;
 	max-height: 70vh;
 	overflow: auto;
 }
 
-nav .navbar-collapse.in .dropdown-menu {
-	max-height: none;
-	overflow: none;
+nav.navbar {
+	max-height: 100vh;
 }
 
-.wall-item-tools .dropdown-menu {
-	min-width: auto;
+#navbar-collapse-2.show {
+	overflow: auto;
 }
 
-.nav-tabs.nav-justified > li {
-	white-space: nowrap;
+.navbar-toggler-right {
+	top: 0.5rem;
 }
+/* nav overrides end */
 
-code {
-	white-space: normal;
+.wall-item-tools .dropdown-menu {
+	min-width: auto;
 }
 
-.form-control {
-	font-size: unset;
+code {
+	white-space: normal;
 }
 
 .panel-group {
diff --git a/view/css/conversation.css b/view/css/conversation.css
index aec457302..289e389fa 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -3,7 +3,7 @@
 .jothidden input[type="text"] {
 	border: 0px;
 	margin: 0px;
-	height: 39px;
+	height: 2.5rem;
 	width: 100%;
 }
 
@@ -23,15 +23,15 @@
 
 #jot-title-wrap input,
 #jot-pagetitle-wrap input {
-	padding: 10px;
+	padding: 0.5rem;
 }
 
 #profile-jot-text {
 	resize: none;
 	border-width: 0px;
-	height: 39px;
-	line-height: 19px;
-	padding: 10px;
+	height: 2.5rem;
+	line-height: 1.5rem;
+	padding: 0.5rem;
 	width: 100%;
 	display: inherit;
 }
@@ -60,29 +60,11 @@
 }
 
 #profile-jot-text-loading {
-	float: left;
 	padding: 30px 0px 0px 12px;
 }
 
 #profile-jot-submit-wrapper {
 	border-top: 1px solid #ccc;
-	padding: 10px;
-}
-
-#profile-jot-perms-end {
-	height: 30px;
-}
-
-#profile-jot-wrapper {
-	margin-bottom: 30px;
-}
-
-#profile-jot-plugin-wrapper {
-	margin-top: 10px;
-}
-
-#profile-rotator-wrapper {
-	float: left;
 }
 
 #profile-rotator {
@@ -91,22 +73,11 @@
 
 /* conversation */
 
-.thread-wrapper.toplevel_item {
-	margin-bottom: 20px;
-}
 
 /* conv_item */
 
-.wall-item-head {
-	padding: 10px 10px 0.5em 10px;
-}
-
-.wall-item-content {
-	padding: 0.5em 10px;
-}
-
-.wall-item-tools {
-	padding: 0.5em 10px 10px 10px;
+.wall-item-head-new {
+	border-top: 0.2rem solid #0275d8;
 }
 
 .wall-item-info {
@@ -119,10 +90,6 @@
 	margin-left:10px;
 }
 
-.lockview-panel {
-	padding: 3px 20px;
-}
-
 .wall-item-lock {
 	float: left;
 }
@@ -137,6 +104,12 @@ a.wall-item-name-link {
 	text-overflow: ellipsis;
 }
 
+.wall-item-ago,
+.wall-item-ago i {
+	font-size: 0.75rem;
+	line-height: 1;
+}
+
 .wall-item-ago .fa-check {
 	cursor: pointer;
 }
@@ -145,41 +118,20 @@ a.wall-item-name-link {
 	overflow: hidden;
 }
 
-.wall-item-content h1,
-.wall-item-content h2 {
-	font-size: 1.319em;
-}
-
-.wall-item-title h3,
-.wall-item-content h3,
-.wall-item-content h4 {
-	font-size: 1.112em;
-}
-
 .wall-item-content img {
 	max-width: 100%;
 }
 
-.wall-item-title h3 {
+.wall-item-title.h3 {
 	font-weight: bold;
 	margin: 0px;
-	white-space: nowrap;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-
-.wall-item-title-end {
-	clear: both;
+	word-wrap: break-word;
 }
 
 .wall-item-body {
 	word-wrap: break-word;
 }
 
-.body-tags {
-	margin-top: 5px;
-}
-
 .item-tool {
 	cursor: pointer;
 }
@@ -212,91 +164,58 @@ a.wall-item-name-link {
 }
 
 .ivoted {
-	color: #337AB7;
+	color: #0275d8;
 }
 
 .item-highlight {
-	border-left: 3px solid #337AB7;
+	border-left: 0.2rem solid #0275d8;
 }
 
 .item-highlight .wall-item-head,
 .item-highlight .wall-item-content,
 .item-highlight .wall-item-tools {
-	padding-left: 7px;
+	padding-left: 0.3rem;
 }
 
 /* comment_item */
 
 .comment-edit-text-empty,
 .comment-edit-text-full {
+	padding: 0.5rem;
+	line-height: 1.25;
 	width: 100%;
 	display: inherit;
 }
 
 .comment-edit-text-empty {
-	padding: 0px 8px;
-	line-height: 28px;
-	height: 30px;
+	height: 2.25rem;
 	overflow: hidden;
 	resize: none;
-
 }
 
 .comment-edit-text-full {
-	padding: 8px;
-	height: 150px;
+	height: 7rem;
 	overflow: auto;
 	resize: vertical;
 }
 
-.qcomment {
-	border: 1px solid #EEE;
-	padding: 3px;
-	margin-top: 15px;
-	margin-left: 25px;
-	width: 125px;
-	overflow-y: auto;
-}
-
-.qcomment option {
-	width: 125px;
-	overflow-x: hidden;
-}
-
-.qcomment {
-	opacity: 0.3;
-	filter:alpha(opacity=30);
-}
-
-.qcomment:hover {
-	opacity: 1.0;
-	filter:alpha(opacity=100);
-}
-
-.comment-tools {
-	display: none;
-	margin-top: 7px;
-}
-
+.comment-tools,
 .comment-edit-preview {
 	display: none;
-	margin-top: 7px;
 }
 
 /* disable link handling for unknown entries */
-.dropdown-menu > li > a.disabled {
+.dropdown-menu a.disabled {
 	pointer-events: none;
 	cursor: default;
 }
 
 .item-verified {
 	color: darkgreen;
-	font-size: 1em !important;
 }
 
 .item-forged {
 	color: #FF0000;
-	font-size: 1em !important;
 }
 
 /* event item */
diff --git a/view/css/default.css b/view/css/default.css
index a51461201..fc6da54f9 100644
--- a/view/css/default.css
+++ b/view/css/default.css
@@ -18,7 +18,7 @@ aside {
 	position: relative;
 	display: table-cell;
 	vertical-align: top;
-	padding: 71px 7px 0px 7px;
+	padding: 4.5rem 7px 0px 7px;
 }
 
 section {
@@ -26,5 +26,5 @@ section {
 	width: 100%;
 	display: table-cell;
 	vertical-align: top;
-	padding: 71px 7px 200px 7px;
+	padding: 4.5rem 7px 200px 7px;
 }
diff --git a/view/css/mod_chat.css b/view/css/mod_chat.css
index 57aecd557..c56091102 100644
--- a/view/css/mod_chat.css
+++ b/view/css/mod_chat.css
@@ -16,6 +16,10 @@
 	text-align: right;
 }
 
+#chatrooms-index td:nth-child(3){
+	white-space: nowrap;
+}
+
 #chatrooms-index th:nth-child(4),
 #chatrooms-index td:nth-child(4){
 	padding: 7px 10px 7px 7px;
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index f0b5c0166..6fccf3f44 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -21,11 +21,6 @@
 	border-color: #ccc !important;
 }
 
-#events-spinner .spinner {
-	margin-top: 9px;
-	margin-bottom: -9px;
-}
-
 .bootstrap-tagsinput {
 	width: 100%;
 	padding: 6px 12px;
diff --git a/view/css/mod_help.css b/view/css/mod_help.css
index f59a40894..c0b0bafa3 100644
--- a/view/css/mod_help.css
+++ b/view/css/mod_help.css
@@ -11,14 +11,6 @@
 	padding-bottom: 0.3em;
 }
 
-#doco-content h4 {
-	text-decoration: underline;
-}
-    
-#doco-content h5 {
-	text-decoration: underline;
-}
-
 #region_1 .widget ul ul {
 	list-style-type: none;
 }
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index c1874edac..6a98267f0 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -5,8 +5,8 @@
 }
 
 .mail-conv-sender img{
-	width: 32px;
-	height: 32px;
+	width: 2.2rem;
+	height: 2.2rem;
 }
 
 .mail-conv-sender-name {
diff --git a/view/css/mod_webpages.css b/view/css/mod_webpages.css
index 805d95dc2..f665800f1 100644
--- a/view/css/mod_webpages.css
+++ b/view/css/mod_webpages.css
@@ -6,27 +6,31 @@
 	width: 100%;
 }
 
-#webpage-list-table th:nth-child(1){
+#webpage-list-table th:nth-child(1) {
 	padding: 7px 3px 7px 10px;
 	white-space: nowrap;
 }
 
-#webpage-list-table td:nth-child(1){
+#webpage-list-table td:nth-child(1) {
 	padding: 7px 3px 7px 10px;
 }
 
-#webpage-list-table th:nth-child(2){
+#webpage-list-table th:nth-child(2) {
+	white-space: nowrap;
+}
+
+#webpage-list-table td:nth-child(3) {
 	white-space: nowrap;
 }
 
 #webpage-list-table th:nth-child(7),
-#webpage-list-table td:nth-child(7){
+#webpage-list-table td:nth-child(7) {
 	padding: 7px 3px;
 	white-space: nowrap;
 }
 
 #webpage-list-table th:nth-child(8),
-#webpage-list-table td:nth-child(8){
+#webpage-list-table td:nth-child(8) {
 	padding: 7px 10px 7px 7px;
 	white-space: nowrap;
 }
@@ -192,4 +196,4 @@
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
-}
\ No newline at end of file
+}
diff --git a/view/css/mod_wiki.css b/view/css/mod_wiki.css
index 83f17c820..b44ec4fd8 100644
--- a/view/css/mod_wiki.css
+++ b/view/css/mod_wiki.css
@@ -41,6 +41,7 @@
 #wikis-index th:nth-child(3),
 #wikis-index td:nth-child(3){
 	padding: 7px 10px 7px 7px;
+	white-space: nowrap;
 }
 
 #wikis-index th:nth-child(4),
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 9b97d8bf7..622c1cb86 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -1,53 +1,27 @@
 .widget {
-	margin-bottom: 10px;
-	padding: 10px;
+	margin-bottom: 1rem;
+	padding: 0.5rem;
 }
 
 .widget h3 {
 	margin-top: 0px;
 }
 
-.widget-input {
-	width: 100%;
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-	border-right: 0px;
-}
-
 .tags {
 	word-wrap: break-word;
 }
 
 .widget-nav-pills-icons {
 	opacity: 0;
-	padding: 6px 10px;
 	float: right;
-	position: relative;
-	z-index:1;
 }
 
-
 .widget-nav-pills-checkbox {
-	padding: 6px 10px;
+	padding: 0.6rem 1.4rem;
 	float: right;
-	position: relative;
-	z-index:1;
 	cursor: pointer;
 }
 
-i.widget-nav-pills-icons,
-i.widget-nav-pills-checkbox {
-	margin-top: 2px;
-}
-
-.widget-nav-pills-icons:hover + a {
-	background-color: #eee;
-}
-
-.widget-nav-pills-checkbox:hover + a {
-	background-color: #eee;
-}
-
 li:hover .widget-nav-pills-icons {
 	opacity: 1;
 }
@@ -150,16 +124,6 @@ li:hover .group-edit-icon {
 	width: 250px;
 }
 
-/* events tools */
-
-#event-upload-form {
-	margin-top: 10px;
-}
-
-#event-upload-choose {
-	width: 100%;
-}
-
 /* cover photo */
 
 #cover-photo {