Merge remote-tracking branch 'upstream/master'

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

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 68bfd5d3a9213a0750b8b37460c941898497ab06..c87f51d1a4a57dbce44d0fbebe3ff9d72cd1b2d8 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -141,6 +141,7 @@
 .icon.language    { background-image: url("../../../view/theme/diabook/icons/language.png");}
 
 
+
 .camera        { background-image: url("../../../view/theme/diabook/icons/camera.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }
@@ -167,7 +168,7 @@
                          }
 .unglobe       { background-image: url("../../../view/theme/diabook/icons/unglobe.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
-                         }
+                         }             
 .edit    {background-image: url("../../../view/theme/diabook/icons/pencil2.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
 .icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
@@ -221,6 +222,7 @@
 .attachtype {
         display: block; width: 20px; height: 23px;
         background-image: url('../../../images/content-types.png');
+               background-position: -80px 0px;
 }
 
 .type-video { background-position: 0px 0px; }
@@ -230,7 +232,7 @@
 .type-unkn  { background-position: -80px 0px; }
 
 .icon.drop, .icon.drophide {
- float: left;
+ float: right;
 }
 
 .icon {
@@ -843,6 +845,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;
@@ -850,17 +853,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,
@@ -871,6 +880,8 @@ nav #nav-site-linkmenu .menu-popup {
   left: auto;
 }
 
+
+
 nav #nav-messages-linkmenu.on .icon.messages, nav #nav-messages-linkmenu.selected .icon.messages{
        background-image: url("../../../view/theme/diabook/icons/messages2.png");
        }
@@ -1043,6 +1054,14 @@ ul.menu-popup .empty {
        }
 .menu-profile-list-item{
        padding-left: 5px;
+       padding-top: 0.5em;
+       display: inline;
+       vertical-align: middle;
+       }       
+#profile-side-status .menu-profile-list-item{
+       padding-left: 5px;
+       padding-top: 0.6em;
+       display: inline;
        vertical-align: middle;
        }       
 .menu-profile-list-item:hover{ 
@@ -1278,6 +1297,9 @@ aside #login-extra-links{
   height: 22px;
   width: 22px;
 }
+#group-all-contacts{
+  overflow: auto;
+}
 .icon.text_add         { 
                background-image: url("../../../images/icons/16/add.png");
                float: right;
@@ -1342,6 +1364,9 @@ body .pageheader{
 #id_openid_url {
   width: 173px;        
        }
+.contact-edit-submit{
+       display: block;
+       }
 #contact-edit-end {
        }
 .pager {
@@ -1351,6 +1376,15 @@ body .pageheader{
        clear: both;
        display: block;
 }      
+.pager_current a {
+   margin: 3px;
+   color: #000;
+   font-weight: bolder;
+}      
+.pager_n a {
+   margin: 2px;
+   font-weight: bold;
+}
 .tabs {
     
     background-position: 0 -20px;
@@ -1689,6 +1723,17 @@ body .pageheader{
   background-color: #fff797;
 }
 
+span#jot-preview-link.tab.button{
+       float: right;
+       margin-left: 10px;
+       margin-right: 14px;
+       margin-top: 2px;
+       font-size: 11px;
+       font-weight: bolder;
+       cursor: pointer;
+       border: 0px;
+}
+
 .wall-item-tags {
   padding-top: 1px;
   padding-bottom: 2px;
@@ -1990,14 +2035,6 @@ body .pageheader{
        margin-left: 45px;
        margin-top: 2px;
 }
-#jot-preview-link {
-       float: right;
-       margin-left: 10px;
-       margin-top: 2px;
-       font-size: 9px;
-       font-weight: bolder;
-       cursor: pointer;
-}
 #profile-jot-perms{
    float: right;
        margin-left: 10px;
@@ -2153,6 +2190,10 @@ ul.tabs li .active {
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
 }
+ul.tabs li a {
+text-decoration: none;
+}
+
 //settings tabs
 ul.rs_tabs {
   list-style-type: none;
@@ -2906,4 +2947,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
\ No newline at end of file
+}