Merge branch 'master' of git://github.com/friendica/friendica

5 files changed, 69 insertions, 30 deletions

diff --git a/view/theme/diabook/diabook-dark/custom_tinymce.css b/view/theme/diabook/diabook-dark/custom_tinymce.css
new file mode 100644
index 000000000..7932653b6
--- /dev/null
+++ b/view/theme/diabook/diabook-dark/custom_tinymce.css
@@ -0,0 +1,41 @@
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:14px; margin:8px;}
+body {background:#FFF;}
+body.mceForceColors {background:#FFF; color:#000;}
+h1 {font-size: 2em}
+h2 {font-size: 1.5em}
+h3 {font-size: 1.17em}
+h4 {font-size: 1em}
+h5 {font-size: .83em}
+h6 {font-size: .75em}
+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}
+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}
+td.mceSelected, th.mceSelected {background-color:#3399ff !important}
+img {border:0;}
+table {cursor:default}
+table td, table th {cursor:text}
+ins {border-bottom:1px solid green; text-decoration: none; color:green}
+del {color:red; text-decoration:line-through}
+cite {border-bottom:1px dashed blue}
+acronym {border-bottom:1px dotted #CCC; cursor:help}
+abbr {border-bottom:1px dashed #CCC; cursor:help}
+
+/* IE */
+* html body {
+scrollbar-3dlight-color:#F0F0EE;
+scrollbar-arrow-color:#676662;
+scrollbar-base-color:#F0F0EE;
+scrollbar-darkshadow-color:#DDD;
+scrollbar-face-color:#E0E0DD;
+scrollbar-highlight-color:#F0F0EE;
+scrollbar-shadow-color:#F0F0EE;
+scrollbar-track-color:#F5F5F5;
+}
+
+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}
+font[face=mceinline] {font-family:inherit !important}
+
+
+object {
+	display: block; width: 400px; 
+	background: #cccccc url(../images/plugin.png) no-repeat center center;
+}
diff --git a/view/theme/diabook/diabook-dark/style-network.css b/view/theme/diabook/diabook-dark/style-network.css
index 43541d266..678e8597c 100644
--- a/view/theme/diabook/diabook-dark/style-network.css
+++ b/view/theme/diabook/diabook-dark/style-network.css
@@ -522,9 +522,6 @@ header {
   background: #1d1f1d;
   background-color: #1d1f1d;
   z-index: 100;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
 }
 header #site-location {
   display: none;
@@ -567,9 +564,7 @@ nav {
   background: #1d1f1d;
   color: #2e2f2e;
   z-index: 99;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
+ 
 }
 nav a,
 nav a:active,
@@ -836,7 +831,7 @@ ul.menu-popup .empty {
   box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
 }
 .acpopupitem {
-  color: #2e2f2e;
+  color: #eec;
   padding: 4px;
   clear: left;
 }
diff --git a/view/theme/diabook/diabook-dark/style-profile.css b/view/theme/diabook/diabook-dark/style-profile.css
index 3ecad85af..4b6bc15b5 100644
--- a/view/theme/diabook/diabook-dark/style-profile.css
+++ b/view/theme/diabook/diabook-dark/style-profile.css
@@ -522,9 +522,7 @@ header {
   background: #1d1f1d;
   background-color: #1d1f1d;
   z-index: 100;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
+
 }
 header #site-location {
   display: none;
@@ -567,9 +565,7 @@ nav {
   background: #1d1f1d;
   color: #2e2f2e;
   z-index: 99;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
+
 }
 nav a,
 nav a:active,
diff --git a/view/theme/diabook/diabook-dark/style-wide.css b/view/theme/diabook/diabook-dark/style-wide.css
index 73d0e4c0f..3475408b2 100644
--- a/view/theme/diabook/diabook-dark/style-wide.css
+++ b/view/theme/diabook/diabook-dark/style-wide.css
@@ -553,6 +553,7 @@ code {
   text-decoration: none;
 }
 /* popup notifications */
+div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
@@ -606,9 +607,7 @@ header #banner #logo-img {
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 20px;
-  position: absolute;
-  top: 10%;
+  font-size: 20px!important;position: relative!important;top: -4px!important;
 }
 /* messages */
 #message-new {
diff --git a/view/theme/diabook/diabook-dark/style.css b/view/theme/diabook/diabook-dark/style.css
index f00973085..189bd30bf 100644
--- a/view/theme/diabook/diabook-dark/style.css
+++ b/view/theme/diabook/diabook-dark/style.css
@@ -3,6 +3,20 @@
  * Additional Changes: Michael Vogel <icarus@dabo.de>
  **/
 
+/** Fancy Box **/
+#fancybox-content {
+	width: 0;
+	height: 0;
+	padding: 0;
+	outline: none;
+	position: relative;
+	overflow: hidden;
+	z-index: 1102;
+	border: 0px solid #fff;
+	background: #2e2e2f !important;
+}
+
+
 /* ========= */
 /* = Admin = */
 /* ========= */
@@ -553,6 +567,7 @@ code {
   text-decoration: none;
 }
 /* popup notifications */
+div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #2e2f2e;
@@ -576,9 +591,6 @@ header {
   background: #0c0e0c;
   background-color: #1d1f1d;
   z-index: 100;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
 }
 header #site-location {
   display: none;
@@ -606,9 +618,7 @@ header #banner #logo-img {
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 20px;
-  position: absolute;
-  top: 10%;
+  font-size: 20px!important;position: relative!important;top: -4px!important;
 }
 /* messages */
 #message-new {
@@ -625,7 +635,7 @@ header #banner #logo-text {
     text-decoration: none;
 }
 .mail-list-wrapper {
-  background-color: #eec;
+  background-color: #333;
   margin-bottom: 5px;
   width: 100%;
   height: auto;
@@ -636,6 +646,7 @@ header #banner #logo-text {
   float: left;
   width: 20%;
   overflow: hidden;
+  background: #2e2e2f;
 }
 .mail-list-wrapper .mail-subject {
   width: 30%;
@@ -701,10 +712,7 @@ nav {
   background: #1d1f1d;
   color: #2e2f2e;
   z-index: 99;
-  border-bottom: 1px;
-  border-bottom-color: black;
-  border-bottom-style: inset;
-}
+ }
 nav a,
 nav a:active,
 nav a:visited,
@@ -910,7 +918,7 @@ nav #nav-apps-link.selected {
 }
 
 .notify-seen {
-	background: none repeat scroll 0 0 #DDDDDD;
+	background: none repeat scroll 0 0 #666;
 	}
 
 ul.menu-popup {
@@ -1401,7 +1409,7 @@ body .pageheader{
   padding-top: 10px;
 }
 .tread-wrapper a{
-  color: #1872A2;
+ /* color: #1872A2; */
 }
 
 .wall-item-decor {
@@ -1680,7 +1688,7 @@ body .pageheader{
 .wall-item-comment-wrapper .comment-edit-text-full {
   font-size: 14px;
   height: 4em;
-  color: #2e302e;
+  color: #eec;
   border: 1px solid #2e302e;
 }
 .comment-edit-preview {