Merge remote 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 df692cbc657bc1e88a5c5728c2fbe1db30ab03e6..d964243a93ad600c3edb4020e19247b6502cfbe8 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -394,7 +394,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;
@@ -462,7 +462,7 @@ code {
 }
 #panel {
   position: absolute;
-  width: 10em;
+  width: 12em;
   background: #ffffff;
   color: #2d2d2d;
   margin: 0px;
@@ -769,8 +769,6 @@ ul.menu-popup {
   margin: 0px;
   padding: 0px;
   list-style: none;
-  border: 1px solid #364e59;
-  border-top-color: transparent;
   z-index: 100000;
   -webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
   -moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
@@ -878,27 +876,57 @@ ul.menu-popup .empty {
   padding-top: 4px;
   padding-left: 5px;   
   color: #2D2D2D;
+  word-wrap: break-word;
+  width: 130px;
        }
 #ps-username:hover{
   text-decoration: none;       
        }
 .menu-profile-side{
-       list-style: none;       
-  padding-left: 16px;
-  min-height: 16px;
+  list-style: none;    
+  padding-left: 0px;
+  min-height: 0px;
        }
 .menu-profile-list{
   height: auto;
   overflow: auto;
   padding-top: 3px;
   padding-bottom: 3px;
+  padding-left: 16px;
+  min-height: 16px;
+  list-style: none;
        }
 .menu-profile-list:hover{
        background: #EEE;
        }
+.menu-profile-list-item{
+       padding-left: 5px;
+       }       
 .menu-profile-list-item:hover{ 
-       text-decoration: none;  
+       text-decoration: none;
    }
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+       background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+       }
+.menu-profile-list.photos{
+       background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+       }
+.menu-profile-list.events{
+       background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+       }
+.menu-profile-list.notes{
+       background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+       }
+.menu-profile-list.foren{
+       background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+       }
+.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/icons/pscontacts.png") no-repeat;
+       }
 
 /* aside */
 aside {
@@ -1189,10 +1217,10 @@ body .pageheader{
 }
 
 .wall-item-container .wall-item-content {
-  font-size: 13px;
+  font-size: 12.5px;
   max-width: 720px;
   word-wrap: break-word;
-  line-height: 1.4;
+  line-height: 1.2;
 }
 
 .wall-item-container .wall-item-content img {
@@ -1904,7 +1932,6 @@ ul.tabs li .active {
 /* photo */
 .lframe {
   float: left;
-  margin: 0px 10px 10px 0px;
 }
 /* profile match wrapper */
 .profile-match-wrapper {
@@ -2351,24 +2378,60 @@ float: left;
 .contact-details {
   color: #999999;
 }
-
-.photo-top-image-wrapper {
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+       }
+#side-bar-photos-albums{
+       margin-top: 15px;       
+       }
+.photo-top-photo, .photo-album-photo {
+  -webkit-border-radius: 5px 5px 0 0;
+  -moz-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+  float: left;
+   -moz-box-shadow: 0 0 5px #888;
+   -webkit-box-shadow: 0 0 5px #888;
+   box-shadow: 0 0 5px #888;
+  background-color: #000;
+   -webkit-border-radius: 5px;
+   -moz-border-radius: 5px;
+  border-radius: 5px;
+  padding-bottom: 20px;
+  position: relative;
+  margin: 0 10px 10px 0;
+  width: 200px; height: 140px;
+  overflow: hidden;  
+}
+/*
+.photo-top-album-name {
+  position: absolute;
+  bottom: 0;
+  padding: 0 5px;
+}*/
+/*.photo-top-image-wrapper {
         position: relative;
         float: left;
         margin-top: 15px;
         margin-right: 15px;
         width: 200px; height: 200px; 
-        overflow: hidden; 
-}
+        
+}*/
 .photo-top-album-name {
         width: 100%;
-        min-height: 2em;
         position: absolute; 
         bottom: 0px; 
-        padding: 0px 3px;
-        padding-top: 0.5em;
-        background-color: rgb(255, 255, 255);
+        padding-left: 3px;
+        background-color: #EEE;
 }
+.photo-top-album-link{
+  color: #3465A4;
+       }
 #photo-top-end {
         clear: both;
 }