Merge remote branch 'upstream/master'

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

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index f0cf04d651cac2c289c0aea2998c9af6d31fc03d..74ab3c233a1388c51635b83b1919f7a4cbc321b6 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -111,6 +111,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;
                          }
@@ -395,7 +396,7 @@
 /* global */
 body {
   font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif;
-  font-size: 13px;
+  font-size: 12.5px;
   background-color: #ffffff;
   color: #2d2d2d;
   margin: 50px auto auto;
@@ -877,6 +878,8 @@ ul.menu-popup .empty {
   padding-top: 4px;
   padding-left: 5px;   
   color: #2D2D2D;
+  word-wrap: break-word;
+  width: 130px;
        }
 #ps-username:hover{
   text-decoration: none;       
@@ -906,22 +909,25 @@ ul.menu-popup .empty {
    }
 /*http://prothemedesign.com/circular-icons/*/
 .menu-profile-list.home{
-       background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
        }
 .menu-profile-list.photos{
-       background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
        }
 .menu-profile-list.events{
-       background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
        }
 .menu-profile-list.notes{
-       background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
        }
 .menu-profile-list.foren{
-       background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
        }
 .menu-profile-list.com_side{
-       background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+       background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+       }
+.menu-profile-list.pscontacts{
+       background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
        }
 
 /* aside */
@@ -934,6 +940,7 @@ aside {
   float: left;
   /* background: #F1F1F1; */
 }
+aside #page-sidebar{display: none;}
 
 aside .vcard .fn {
   font-size: 18px;
@@ -1088,6 +1095,32 @@ aside #side-peoplefind-url {
   background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
 }
 /* widget: search */
+span.sbox_l  {
+       background: white url('../../../view/theme/diabook/icons/srch_l.gif') no-repeat top left;
+       float: left;
+       width: 19px; height: 19px;
+       margin-left: 10px;
+       margin-top: 5px;
+       
+}
+
+span.sbox_r  {
+       background: white url('../../../view/theme/diabook/icons/srch_r.gif') no-repeat top left;
+       float: left;
+       width: 19px; height: 19px;
+       margin-top: 5px;
+}
+
+span.sbox input {
+       background: white url('../../../view/theme/diabook/icons/srch_bg.gif') repeat-x top left;
+       float: left;
+       margin-top: 5px;
+       border: 0;
+       height: 13px; width: 100px;
+       padding: 3px;
+       font: 11px/13px arial;
+       color: #000;
+}
 #add-search-popup {
   width: 200px;
   top: 18px;
@@ -1149,8 +1182,7 @@ body .pageheader{
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 160px;
-  padding-right: 10px;
+  width: 170px;
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
@@ -1161,7 +1193,28 @@ right_aside .directory-item {    width: 50px; height: 50px; vertical-align: center;
 right_aside .directory-photo { margin: 0px; }
 right_aside .directory-photo-img { max-width: 45px; max-height: 45px; }
 right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
-right_aside .items-wrapper{ overflow: auto;    width: 100%; border-bottom: 1px solid #D2D2D2;}
+right_aside .items-wrapper{ overflow: auto;    width: 100%; }
+right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto;  width: 100%; }
+right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto;  width: 100%; }
+#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;}
+#page-sidebar-right_aside ul {margin-top: 0px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box             { 
+               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               float: right;
+               opacity: 0.1;
+               }
+.close_box:hover       { 
+               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               float: right;
+               cursor: pointer;
+               opacity: 1;
+-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;
+               }
 
 /* wall item */
 .tread-wrapper {
@@ -1187,6 +1240,7 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
 .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
   display: table-row;
 }
+
 .wall-item-bottom {
   font-size: 13px;
 }
@@ -1231,14 +1285,14 @@ right_aside .items-wrapper{ overflow: auto;     width: 100%; border-bottom: 1px soli
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
-  max-width: 720px;
+  font-size: 12.5px;
+  max-width: 420px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 700px;
+  max-width: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1697,12 +1751,13 @@ right_aside .items-wrapper{ overflow: auto;     width: 100%; border-bottom: 1px soli
     margin-left: 5px;
 }
 /*input[type="submit"] {
-       border: 0px;
-    background-color: @ButtonBackgroundColor;
-    color: @ButtonColor;
-    padding: 0px 10px;
-       .rounded(5px);
-    height: 18px;
+    background-color: #33ACFF;
+    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    border: 1px solid #777777;
+    color: white;
+    border-radius: 3px 3px 3px 3px;
+    box-shadow: 0 1px 1px #CFCFCF;
+    margin-left: 5px;
 }*/
 /** acl **/
 #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper {