Merge https://github.com/friendica/friendica into pull

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

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 0afb2cac8864367a1794cb9cc463393996253c5e..286559b859b9906a3fefc177bee882fe5da0c498 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -21,6 +21,7 @@
 
 .admin.linklist {
         border: 0px; padding: 0px;
+        list-style: none;
 }
 
 .admin.link {
@@ -130,7 +131,8 @@
 .icon.pencil   { background-image: url("../../../view/theme/diabook/icons/pencil.png");}
 .icon.recycle  { background-image: url("../../../view/theme/diabook/icons/recycle.png");}
 .icon.remote-link { background-image: url("../../../view/theme/diabook/icons/remote.png");}
-.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}  
+.icon.tagged    { background-image: url("../../../view/theme/diabook/icons/tagged.png");}
+.icon.file-as { background-image: url("../../../view/theme/diabook/icons/file_as.png");}  
 .star-item.icon.unstarred { background-image: url("../../../view/theme/diabook/icons/unstarred.png");}
 .star-item.icon.starred { background-image: url("../../../view/theme/diabook/icons/starred.png");}
 .icon.link             { background-image: url("../../../view/theme/diabook/icons/link.png");}
@@ -149,7 +151,7 @@
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
                          }     
 .video         { background-image: url("../../../view/theme/diabook/icons/video.png"); 
-                         display: block; width: 100%; height: 28px; background-repeat: no-repeat;
+                         display: block; width: 100%; height: 140px; background-repeat: no-repeat;
                          }
 .audio2        { background-image: url("../../../view/theme/diabook/icons/audio.png"); 
                          display: block; width: 28px; height: 28px; background-repeat: no-repeat;
@@ -436,6 +438,10 @@ body {
   display: table;
 }
 
+#jappix_mini {
+right: 45px !important;
+}
+
 h4 {
   font-size: 1.1em;
 }
@@ -552,6 +558,7 @@ code {
   text-decoration: none;
 }
 /* popup notifications */
+div.jGrowl.top-right { top: 30px; /* put it below header/nav bar */ }
 div.jGrowl div.notice {
   background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center;
   color: #ffffff;
@@ -604,9 +611,7 @@ header #banner #logo-img {
   margin-top: 3px;
 }
 header #banner #logo-text {
-  font-size: 20px;
-  position: absolute;
-  top: 10%;
+  font-size: 20px!important;position: relative!important;top: -4px!important;
 }
 /* messages */
 #message-new {
@@ -969,7 +974,7 @@ ul.menu-popup .empty {
   background-color: #bdcdd4;
 }
 #nav-notifications-menu {
-  width: 400px;
+  width: 425px !important;
   max-height: 550px;
   overflow: auto;
 }
@@ -1193,7 +1198,14 @@ aside #side-peoplefind-url {
   margin-right: 20px;  
        }
 #login-submit-wrapper{
-  margin-top: 20px;
+
+  margin-bottom: 12px;
+       }
+aside #login-submit-button{
+  margin-left: 0px!important;  
+       }
+aside #login-extra-links{
+  padding-top: 0px!important;  
        }
 /* widget */
 .widget {
@@ -1452,7 +1464,7 @@ body .pageheader{
   max-width: 720px;
   word-wrap: break-word;
 
-  margin-bottom: 14px;
+
 }
 .wall-item-photo-container .wall-item-content {
 
@@ -1615,13 +1627,13 @@ body .pageheader{
   padding-left: 12px;
 }
 .wall-item-comment-wrapper {
-  margin: 1px 5px 17px 80px;
+  margin: 1px 5px 5px 80px;
 }
 .wall-item-comment-wrapper .comment-edit-photo {
   display: none;
 }
 .wall-item-comment-wrapper textarea {
-  height: 2.0em;
+  height: 1.6em;
   width: 100%;
   font-size: 10px;
   color: #999999;
@@ -1683,14 +1695,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #3465A4;
+  color: #999;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #3465A4;
+  color: #999;
 }
 .wwto {
   position: absolute !important;
@@ -1868,7 +1880,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
   margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
     
         border-radius: 5px 5px 5px 5px;
     font-weight: bold;
@@ -2545,17 +2557,40 @@ a.mail-list-link {
 }
 
 .vevent {
-        border: 1px solid #CCCCCC;
-}
-.vevent .event-description, .vevent .event-location {
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+}
+.vevent .event-location {
         margin-left: 10px;
         margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
+}
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
 }
 
+
 #new-event-link {
         margin-bottom: 10px;
 }
@@ -2568,7 +2603,7 @@ a.mail-list-link {
 }
 
 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
         margin-right: 15px;
 }
 
@@ -2697,6 +2732,30 @@ float: left;
 /* ============= */
 /* = Directory = */
 /* ============= */
+section .directory-item dl {
+  height: auto;
+  overflow: auto;      
+}
+section .directory-item dt {
+  float: left;
+  margin-left: 0px;
+  text-align: right;
+  color: #999;
+}
+section .directory-item dd {
+  float: left;
+  margin-left: 5px;
+}
+.directory-profile-wrapper {
+  float: left;
+  max-height: 178px;
+  overflow: hidden;
+  width: 635px;
+}
+.directory-copy-wrapper {
+  float: left;
+  overflow: hidden;    
+}
 /* contacts menu */
 .contact-photo-wrapper {
   position: relative;
@@ -2738,7 +2797,7 @@ float: left;
 }
 .directory-item {
   float: left;
-  width: 200px;
+  width: 800px;
   height: 200px;
 }
 .directory-item .contact-photo {
@@ -2749,14 +2808,38 @@ float: left;
   width: 175px;
   height: 175px;
 }
+section .directory-photo-wrapper {
+  float: left;
+  height: 200px;
+  width: 165px;        
+}
 .contact-name {
-  text-align: left;
+  font-size: 18px;
   font-weight: bold;
-  font-size: 12px;
+  margin-bottom: -3px;
+  text-align: left;
 }
 .contact-details {
   color: #999999;
 }
+.page-type {
+  font-size: 10px;
+  font-style: italic;
+}
+.directory-detailscolumn-wrapper {
+  float: left; 
+  width: 305px;
+  margin-right: 10px;  
+}
+.directory-profile-wrapper dl {
+  margin-top: 3px;
+  margin-bottom: 3px;
+}
+.directory-profile-title {
+  font-weight: bold;
+  margin-bottom: 3px;
+  font-size: 14px;
+}
 #side-bar-photos-albums li{
 list-style-type: disc;
 }
@@ -2823,4 +2906,4 @@ list-style-type: disc;
 #photos-upload-newalbum-div {
         float: left;
         width: 175px;
-}
\ No newline at end of file
+}