Merge branch 'master' of ../save/merge/frio into frio_merge

[friendica.git] / view / theme / diabook / diabook-blue / style.css

diff --git a/view/theme/diabook/diabook-blue/style.css b/view/theme/diabook/diabook-blue/style.css
index d6d6a85db337665cf9ef2e8ddfaa8ce016881c9a..93efb723b5969886be890d5762e0a3aa43039afa 100644 (file)
--- a/view/theme/diabook/diabook-blue/style.css
+++ b/view/theme/diabook/diabook-blue/style.css
@@ -852,6 +852,7 @@ nav #nav-directory-link,
 nav #nav-apps-link,
 nav #nav-site-linkmenu, 
 nav #nav-home-link,
+nav #nav-login-link,
 nav #nav-user-linkmenu
 {
   float: right;
@@ -859,17 +860,23 @@ nav #nav-user-linkmenu
 nav #nav-user-linkmenu{
        margin-right: 0px;
        }
-nav #nav-home-link, #nav-directory-link, #nav-apps-link{
+nav #nav-home-link, #nav-directory-link, #nav-login-link, #nav-apps-link{
        margin-left: 0px;
        margin-right: 0px;
        font-weight: bold;
        margin: 3px 5px;
        }
 nav #nav-directory-link{
-  margin-right: 0px;   
+  margin-right: 10px;  
        }
+
+li#nav-site-linkmenu.nav-menu-icon{
+       display: none;
+}
+
 nav #nav-home-link{
-  margin-left: 0px;    
+   margin-left: 0px;   
+   display: none;
        }
 nav #nav-help-link .menu-popup,
 nav #nav-search-link .menu-popup,
@@ -1508,6 +1515,59 @@ body .pageheader{
   display: table;
   width: 780px;
 }
+.wall-item-container .wall-item-content .type-link img,
+.type-link img {
+  max-width: 160px;
+  max-height: 160px;
+  float: left;
+  margin-right: 10px;
+}
+.type-link blockquote {
+  margin-left: 160px;
+  max-height: 160px;
+  overflow: hidden;
+}
+.type-link .oembed {
+}
+
+.shared_header {
+  height: 32px;
+  color: #999;
+  border-top: 1px solid #D2D2D2;
+  padding-top: 5px;
+  margin-top: 5px;
+}
+
+.shared_header a {
+  color: black;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+
+.shared_header a:hover {
+  color: #36c;
+}
+
+.shared_header img {
+  -webkit-border-radius: 4px;
+  -moz-border-radius: 4px;
+  border-radius: 4px;
+  float: left;
+}
+
+.shared_header span {
+  margin-left: 9px;
+}
+
+blockquote.shared_content {
+  margin-left: 32px;
+  color: #000;
+  border: none;
+}
+
 .my-comment-photo {
   width: 48px;
   margin-left: 40px;