Merge commit 'upstream/master'

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

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index f0cf04d651cac2c289c0aea2998c9af6d31fc03d..6b05903d3827c9350bca5f98b46c5d4a7ff89ee6 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -395,7 +395,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;
@@ -543,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 {
@@ -630,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;
@@ -641,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;
        }
 
 
@@ -877,6 +883,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;       
@@ -989,6 +997,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;
@@ -1018,8 +1032,8 @@ aside #side-peoplefind-url {
   margin: 0px 2px 2px 0px;
 }
 #contact-block .contact-block-link img {
-  widht: 55px;
-  height: 55px;
+  widht: 48px;
+  height: 48px;
 }
 #lost-password-link {
   float: left;
@@ -1088,6 +1102,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;
@@ -1096,16 +1136,20 @@ aside #side-peoplefind-url {
 section {
   display: table-cell;
   vertical-align: top;
-  width: auto;
+  width: 610px;
   padding: 0px 0px 0px 12px;
 }
 
 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;        
        }
@@ -1132,7 +1176,6 @@ body .pageheader{
     padding: 0;
  }
 .tab.button {
-    margin-right: 5px; 
     margin-left: 5px;  
     /*background: none repeat scroll 0 0 #F8F8F8;*/
     border: 1px solid #CCCCCC;
@@ -1149,20 +1192,42 @@ 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 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; }
 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;}
+#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;
@@ -1187,6 +1252,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 +1297,16 @@ 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;
+  margin-bottom: 14px;
 }
 
 .wall-item-container .wall-item-content img {
-  max-width: 700px;
+  max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;
@@ -1332,9 +1400,9 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
   border: 1px solid #2d2d2d;
 }
 .comment-edit-preview {
-  width: 710px;
-  border: 1px solid #2d2d2d;
+  width: 500px;
   margin-top: 10px;
+  background-color:  #fff797;
 }
 .comment-edit-preview .contact-photo {
   width: 32px;
@@ -1480,6 +1548,11 @@ right_aside .items-wrapper{ overflow: auto;      width: 100%; border-bottom: 1px soli
   padding: 0.3em;
   margin-bottom: 10px;
 }
+.grey
+{
+  display: inline;
+  float: right;        
+       }
 #jot #jot-tools {
   margin: 0px;
   padding: 0px;
@@ -1565,7 +1638,7 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
     height: 20px;
     margin: 0 0 5px;
     width: 60%;
-    border: 1px solid #ffffff;
+    border: 1px solid #d2d2d2;
 }
 #profile-jot-form #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1620,7 +1693,7 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
 #profile-jot-submit {
        float: right;
        margin-top: 2px;
-       
+       font-size: 14px;
 }
 #profile-upload-wrapper {
        float: left;
@@ -1672,7 +1745,9 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
        float: right;
        margin-left: 10px;
        margin-top: 2px;
-       font-size: 10px;
+       font-size: 9px;
+       font-weight: bolder;
+       cursor: pointer;
 }
 #profile-jot-perms{
    float: right;
@@ -1683,9 +1758,10 @@ right_aside .items-wrapper{ overflow: auto;      width: 100%; border-bottom: 1px soli
 .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: #33ACFF;
@@ -1695,6 +1771,8 @@ right_aside .items-wrapper{ overflow: auto;       width: 100%; border-bottom: 1px soli
     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;
@@ -1944,6 +2022,11 @@ ul.tabs li .active {
   float: left;
 }
 /* photo */
+.photo {
+border-radius: 10px;   
+height: 145px !important;
+width: 145px !important;
+       }
 .lframe {
   float: left;
 }
@@ -1976,7 +2059,7 @@ ul.tabs li .active {
        padding: 0px;
         width: 16px;
         height: 16px;
-        top: -20px; left:0px;
+        top: -16px; left:0px;
         overflow: hidden;
         text-indent: 40px;
         display: none;
@@ -2014,6 +2097,11 @@ blockquote {
     border-left: 1px solid #D2D2D2;
     padding-left: 9px;
     margin: 0 0 0 .8ex;
+    color: #777;
+}
+.oembed {
+       font-size: large;
+       font-weight: bold;
 }
 .aprofile dt{
 box-shadow: 1px 1px 5px 0;
@@ -2026,8 +2114,8 @@ box-shadow: 1px 1px 5px 0;
 /* ================== */
 
 .contact-block-img {
-        width: 55px;
-        height: 55px;
+        width: 48px;
+        height: 48px;
         padding-right: 3px;
 }
 .contact-block-div {
@@ -2350,8 +2438,8 @@ float: left;
   display: none;
   /* position: absolute; */
   /* position: absolute; */
-  left: -2px;
-  top: -20px;
+  left: 0px;
+  top: -16px;
 }
 .contact-wrapper {
   float: left;
@@ -2458,4 +2546,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
\ No newline at end of file
+}