Merge commit 'upstream/master'

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

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index f23518555ade71c545107769c93d281d0247ba2c..991b198497b1870611c74ac5a44c698a5a40ae5a 100644 (file)
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -384,11 +384,10 @@
 
 .hide-comments-outer {
   margin-left: 80px;
-  margin-bottom: 5px;
+  margin-bottom: 1px;
   width: 484px;
   border-bottom: 1px solid #BDCDD4;
-  border-top: 1px solid #BDCDD4;
-
+  background-color: #fff;
   padding: 8px;
 }
 
@@ -544,15 +543,17 @@ header #banner a:hover {
   text-decoration: none;
   outline: none;
   vertical-align: middle;
+ font-weight: bolder;
+  margin-left: 3px;
 }
 header #banner #logo-img {
   height: 25px;
-  margin-top: 5px;
+  margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 22px;
+  font-size: 20px;
   position: absolute;
-  top: 15%;
+  top: 10%;
 }
 /* nav */
 nav {
@@ -631,7 +632,7 @@ nav #logo-text {
 nav .nav-menu-search {
   position: relative;
 
-  margin: 3px 17px;
+  margin: 4px 17px;
   margin-right: 0px;
   height: 17px;
   width: 180px;
@@ -642,6 +643,10 @@ nav #search-box #search-text {
   background-image:  url('icons/lupe.png');
   background-repeat:no-repeat;
   padding-left:20px;
+  border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
        }
 
 
@@ -794,7 +799,7 @@ ul.menu-popup a {
   text-decoration: none;
 }
 ul.menu-popup a:hover {
-  background-color: #14618a; /*bdcdd4;*/
+  background-color: #308DBF; /*bdcdd4;*/
   color: #fff;
 }
 ul.menu-popup .menu-sep {
@@ -936,7 +941,9 @@ ul.menu-popup .empty {
 .menu-profile-list.com_side{
        background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
        }
-
+.menu-profile-list.pscontacts{
+       background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat;
+       }
 /* aside */
 aside {
   display: table-cell;
@@ -1002,6 +1009,12 @@ aside #profiles-menu {
 }
 aside #search-text {
        width: 150px;
+               height: 17px;
+               padding-left: 10px;
+       border-top-left-radius: 15px;
+border-top-right-radius: 15px;
+border-bottom-right-radius: 15px;
+border-bottom-left-radius: 15px;
 }
 aside #side-follow-url {
        width: 150px;
@@ -1111,6 +1124,32 @@ list-style-type: disc;
   background: url("../../../view/theme/diabook-blue/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;
@@ -1125,10 +1164,14 @@ section {
 
 body .pageheader{
   text-align: center;
-  margin-top: 25px;
-  font-size: 0px;
+  font-size: 20px;
+  margin-bottom: 20px;
+  margin-top: 0px;
+  max-width: 575px;
+       }
+.qcomment{
+  max-width: 122px;    
        }
-
 #id_username {
   width: 173px;        
        }
@@ -1173,14 +1216,14 @@ body .pageheader{
 right_aside {
   display: table-cell;
   vertical-align: top;
-  width: 160px;
-  padding-right: 10px;
+  width: 170px;
+  
   /*border-left: 1px solid #D2D2D2;*/
   
   /* background: #F1F1F1; */
 }
 right_aside a{color: #1872A2;}
-right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px; 
+right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 9px; margin-bottom: 0px; 
 margin-top:30px;}
 right_aside .directory-item {  width: 50px; height: 50px; vertical-align: center; text-align: center; }
 right_aside .directory-photo { margin: 0px; }
@@ -1191,6 +1234,26 @@ right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow:
 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;}
+#page-sidebar-right_aside .label {max-width: 128px;}
+right_aside .icon {width: 10px; height: 10px;}
+.close_box             { 
+               background-image: url("../../../view/theme/diabook-blue/icons/close_box.png");
+               float: right;
+               cursor: pointer;
+               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 {
   border-bottom: 1px solid #D2D2D2;
@@ -1271,7 +1334,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 400px;
+  max-width: 400px; 
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1343,8 +1406,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 .wall-item-container.comment .wall-item-links {
   padding-left: 12px;
 }
+
 .wall-item-comment-wrapper {
-  margin: 1px 5px 1px 80px;
+  margin: 1px 0px 0px 80px;
+  background-color: #fff;
+  width: 500px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
@@ -1513,6 +1579,11 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;        
+       }
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1653,7 +1724,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1705,7 +1776,9 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1716,18 +1789,20 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
 .button.creation1 {
     background-color: #fff;
     border: 1px solid #777777;
-    background-image: -moz-linear-gradient(center top , white 0%, #DDDDDD 100%);
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
+    cursor: pointer;
+    font-weight: bolder;
 }
 .button.creation2 {
-    background-color: #1872A2;
-    background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
+    background-color: #055580;
     border: 1px solid #777777;
     color: white;
     border-radius: 3px 3px 3px 3px;
     box-shadow: 0 1px 1px #CFCFCF;
     margin-left: 5px;
+    cursor: pointer;
+    font-weight: bolder;
 }
 /*input[type="submit"] {
        border: 0px;
@@ -2395,8 +2470,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;