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

3 files changed, 3 insertions, 296 deletions

diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 7f9a9e960..1c411113e 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -76,9 +76,9 @@ function channel_privacy_macro(n) {
         $('#id_view_contacts option').eq(5).attr('selected','selected');
         $('#id_view_storage option').eq(5).attr('selected','selected');
         $('#id_view_pages option').eq(5).attr('selected','selected');
-        $('#id_send_stream option').eq(1).attr('selected','selected');
+        $('#id_send_stream option').eq(2).attr('selected','selected');
         $('#id_post_wall option').eq(1).attr('selected','selected');
-        $('#id_post_comments option').eq(1).attr('selected','selected');
+        $('#id_post_comments option').eq(2).attr('selected','selected');
         $('#id_post_mail option').eq(1).attr('selected','selected');
         $('#id_post_photos option').eq(0).attr('selected','selected');
         $('#id_tag_deliver option').eq(1).attr('selected','selected');
@@ -117,4 +117,4 @@ function channel_privacy_macro(n) {
 
 
 
-}
\ No newline at end of file
+}
diff --git a/view/theme/redbasic/css/dark.css b/view/theme/redbasic/css/dark.css
deleted file mode 100644
index 3bcf15bc9..000000000
--- a/view/theme/redbasic/css/dark.css
+++ /dev/null
@@ -1,186 +0,0 @@
-/* This file is deprecated.  We'll keep it here as reference until somebody
-defines a dark colour scheme */
-
-
-body {	font-family: sans-serif;
-	font-size: 12px;
-	background-color: #101010;
-	background-image: -moz-linear-gradient(top, #000 16%, #101010 82%);
-	background-image: linear-gradient(bottom, #000 16%, #101010 82%);
-	background-image: -o-linear-gradient(bottom, #000 16%, #101010 82%);
-	background-image: -webkit-linear-gradient(bottom, #000 16%, #101010 82%);
-	background-image: -ms-linear-gradient(bottom, #000 16%, #101010 82%);
-	background-repeat: no-repeat;
-	background-attachment: fixed;
-	color: #eec;
-	
-}
-
-aside {
-border: none;
-color: #fff;
-}
-
-.fn {
-  color: #fff;
-}
-
-.acl-list-item,
-.profile-jot-net {
-  color: #000;
-}
-
-
-.tab.active {
-	color: #fff;
-}
-
-blockquote {color: #000;}
-
-.wall-item-content-wrapper {
-	background: #262626;
-	border-radius: 5px; 
-	box-shadow: 12px 12px 12px #000; 
-	margin-bottom: 20px;
-}
-
-.wall-item-content-wrapper.comment {
-	margin-left: 50px;
-	box-shadow: 5px 5px 5px #000; 
-}
-
-.comment-edit-text-empty, .comment-edit-text-full {
-	border-radius: 5px 5px 5px 5px;
-	box-shadow: 5px 5px 5px #000 inset;
-}
-
-
-#profile-jot-text {
-	height: 20px;
-	color:#000;
-	border: 1px solid #cccccc;
-	padding: 8px;
-	margin-right: 0px;
-	width: 90%; 
-	-moz-border-radius: 5px;
-	border-radius: 5px;	
-	box-shadow: 4px 4px 3px 0 #666 inset; 
-}
-#profile-jot-text:hover {
-	color: #000000;
-}
-
-#profile-jot-submit {
-    height: auto;
-    background-color: #0080FF;
-    color: #eeeeec;
-    font-weight: bold;
-    -webkit-border-radius: 5px;
-    -moz-border-radius: 5px;
-    border-radius: 5px;
-    border: 2px outset #222420 !important;
-    margin: 0;
-    float: right;
-    text-shadow: 1px 1px #111;
-    width: auto;
-    box-shadow: 5px 5px 5px #444;
-}
-
-
-.widget {
-	border-bottom: 1px solid #eec;
-	padding: 8px;
-	margin-top: 5px;
-	-moz-border-radius:5px;
-	-webkit-border-radius:5px;
-	border-radius:5px;
-
-}
-
-nav a,
-nav a:active,
-nav a:visited,
-nav a:link {
-  color: #ffffff;
-  text-decoration: none;
-  outline: none;
-}
-
-.nav-menu.selected a {
-  color: #0080ff !important;
-}
-
-nav .nav-menu-icon {
-  position: relative;
-  height: 22px;
-  padding: 5px;
-/*  margin: 3px 10px; */
-  -moz-border-radius: 5px 5px 0 0;
-  -webkit-border-radius: 5px 5px 0 0;
-  border-radius: 5px 5px 0 0;
-}
-
-nav .nav-notify {
-  background-color: #0080FF;
-  color: #fff;
-  -moz-border-radius: 5px 5px 5px 5px;
-  -webkit-border-radius: 5px 5px 5px 5px;
-  border-radius: 5px 5px 5px 5px;
-  opacity: 0.6;
-  filter:alpha(opacity=60);
-
-}
-.nav-notify:hover, nav .nav-notify.selected span {
-	color: #ffffff;
-}
-
-ul.menu-popup {
-  
-  position: absolute;
-  display: none;
-  width: 10em;
-  background: #000;
-  color: #fff;
-  padding: 0px;
-  list-style: none;
-  border-radius: 0px 0px 20px 20px;
-  z-index: 100000;
-  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
-  display: block;
-  color: #FFFFFF;
-  padding: 5px 10px;
-  text-decoration: none;
-}
-
-
-ul.menu-popup a:hover {
-  background-color: #888888;
-  color: #FFFFFF;
-}
-ul.menu-popup .menu-sep {
-  border-top: 1px solid #9eabb0;
-}
-
-.wall-item-photo, 
-.photo,
-.contact-block-img,
-.my-comment-photo {
-  border-radius: 5px;
-  box-shadow: 4px 4px 3px #000;
-}
-
-
-div#pagelist-content-wrapper {
-width: 80%;
-background: #111;
-margin-left: auto;
-margin-right: auto;
-}
-
-div.page-list-item {
-margin: 20px;
-}
diff --git a/view/theme/redbasic/css/fancy.css b/view/theme/redbasic/css/fancy.css
deleted file mode 100644
index 9b8899d2f..000000000
--- a/view/theme/redbasic/css/fancy.css
+++ /dev/null
@@ -1,107 +0,0 @@
-/*This file is deprecated.  We'll keep it for reference until we provide window decorations */
-
-
-aside {
-border-radius: $radiuspx;}
-
-
-.tab {
-    height: auto;
-    background-color: #f00;
-    color: #fff !important;
-    font-weight: bold;
-    -webkit-border-radius: $radiuspx;
-    -moz-border-radius: $radiuspx;
-    border-radius: $radiuspx;
-    margin: 0;
-    width: auto;
-    margin-left: 8px;
-    padding: 4px;
-    text-align: center;
-}
-.tab:hover, .tab.active:hover {
-    background: #d00;
-    color: #fff; 
- ;
-}
-.tab:active {
-    background: #fff;
-    color: #f00;
-}
-.tab.active {
-    background: #f00;
-    color: #fff; 
-    box-shadow: 3px 3px 3px #333 inset;
-    padding: 5px; /* strageness of the human mind - has to be larger than inactive tabs, or it looks smaller than them */
-}
-
-
-
-.wall-item-content-wrapper {
-	position: relative;
-	border-radius: $radiuspx;
-	box-shadow: 8px 8px 8px #000;
-	border: 1px solid #eec;
-}
-
-.wall-item-content-wrapper.comment {
-	margin-top: 15px;
-}
-
-.wall-item-like:hover, .wall-item-dislike:hover{
-opacity: 1;
-}
-
-.wall-item-author {
-	margin-top: 10px;
-}
-
-.comment-edit-wrapper {
-	margin-top: 15px;
-	background: #ffffff;
-	margin-left: 50px;
-}
-
-#profile-jot-submit {
-    background-color: #dd0000;
-}
-
-ul.menu-popup {
-  background: #dd0000;
-  color: #eec;
-  border-radius: $radiuspx;
-  z-index: 100000;
-  -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-  box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-ul.menu-popup a {
-  color: #eec;
-}
-ul.menu-popup a:hover {
-  background-color: #eec;
-  color: #f00;
-}
-
-section {
-left: 0px;
-width: 800px;
-margin-left: auto;
-margin-right: auto;
-}
-body {background-color: #d00 !important;}
-
-.page-content-wrapper {background: #fff;
-		color: #000;
-		border-radius: 20px;
-		box-shadow: 5px 5px 5px #111;
-}
-
-h3.page-title {
-padding-top: 30px;
-		color: #033}
-.page-body {padding: 40px;}
-
-.page-body strong {color: #033;}
-
-.nav-links {margin-top: 5px;}